diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml index 4ee68c90..1949cefc 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -1,5 +1,3 @@ -alsa_lib: -- 1.2.8 c_compiler: - gcc c_compiler_version: @@ -18,40 +16,26 @@ dbus: - '1' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' fontconfig: - '2' freetype: - '2' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: - '9' krb5: - '1.20' -libevent: -- 2.1.10 libpng: - '1.6' libsqlite: - '3' -libxml2: -- '2.10' -nspr: -- '4' -nss: -- '3' openssl: - 1.1.1 postgresql: - '15' -pulseaudio: -- '16.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml index 152b5cfa..bb16d69e 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -1,5 +1,3 @@ -alsa_lib: -- 1.2.8 c_compiler: - gcc c_compiler_version: @@ -18,40 +16,26 @@ dbus: - '1' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' fontconfig: - '2' freetype: - '2' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: - '9' krb5: - '1.20' -libevent: -- 2.1.10 libpng: - '1.6' libsqlite: - '3' -libxml2: -- '2.10' -nspr: -- '4' -nss: -- '3' openssl: - '3' postgresql: - '15' -pulseaudio: -- '16.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml index 776fa6ea..9b05cb77 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -alsa_lib: -- 1.2.8 c_compiler: - gcc c_compiler_version: @@ -22,40 +20,26 @@ dbus: - '1' docker_image: - quay.io/condaforge/linux-anvil-aarch64 -expat: -- '2' fontconfig: - '2' freetype: - '2' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: - '9' krb5: - '1.20' -libevent: -- 2.1.10 libpng: - '1.6' libsqlite: - '3' -libxml2: -- '2.10' -nspr: -- '4' -nss: -- '3' openssl: - 1.1.1 postgresql: - '15' -pulseaudio: -- '16.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml index 5f349fe3..5ba0b1dc 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -alsa_lib: -- 1.2.8 c_compiler: - gcc c_compiler_version: @@ -22,40 +20,26 @@ dbus: - '1' docker_image: - quay.io/condaforge/linux-anvil-aarch64 -expat: -- '2' fontconfig: - '2' freetype: - '2' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: - '9' krb5: - '1.20' -libevent: -- 2.1.10 libpng: - '1.6' libsqlite: - '3' -libxml2: -- '2.10' -nspr: -- '4' -nss: -- '3' openssl: - '3' postgresql: - '15' -pulseaudio: -- '16.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml new file mode 100644 index 00000000..f9b61d5e --- /dev/null +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -0,0 +1,47 @@ +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +dbus: +- '1' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +fontconfig: +- '2' +freetype: +- '2' +glib: +- '2' +icu: +- '70' +jpeg: +- '9' +krb5: +- '1.20' +libpng: +- '1.6' +libsqlite: +- '3' +openssl: +- 1.1.1 +postgresql: +- '15' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml new file mode 100644 index 00000000..bee33dcb --- /dev/null +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -0,0 +1,47 @@ +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +dbus: +- '1' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +fontconfig: +- '2' +freetype: +- '2' +glib: +- '2' +icu: +- '70' +jpeg: +- '9' +krb5: +- '1.20' +libpng: +- '1.6' +libsqlite: +- '3' +openssl: +- '3' +postgresql: +- '15' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/migrations/gstreamer121.yaml b/.ci_support/migrations/gstreamer121.yaml deleted file mode 100644 index 9ac8ef92..00000000 --- a/.ci_support/migrations/gstreamer121.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -gstreamer: -- '1.21' -migrator_ts: 1664900131.838455 diff --git a/.ci_support/migrations/libpq15.yaml b/.ci_support/migrations/libpq15.yaml deleted file mode 100644 index 44bce870..00000000 --- a/.ci_support/migrations/libpq15.yaml +++ /dev/null @@ -1,12 +0,0 @@ -migrator_ts: 1669902126 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - -libpq: - - 15 -postgresql: - - 15 -postgresql_plpython: - - 15 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 08059406..f3cfb399 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,11 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: @@ -30,10 +28,6 @@ libsqlite: - '3' macos_machine: - x86_64-apple-darwin13.4.0 -nspr: -- '4' -nss: -- '3' postgresql: - '15' target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b89cb4b1..8c902034 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -14,8 +14,6 @@ cxx_compiler_version: - '14' glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: @@ -28,10 +26,6 @@ libsqlite: - '3' macos_machine: - arm64-apple-darwin20.0.0 -nspr: -- '4' -nss: -- '3' postgresql: - '15' target_platform: diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_openssl1.1.1.yaml index b36de49f..950e4a6c 100644 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -10,8 +10,6 @@ cxx_compiler: - vs2019 glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_openssl3.yaml index e51e98a1..e5b70070 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_openssl3.yaml @@ -10,8 +10,6 @@ cxx_compiler: - vs2019 glib: - '2' -gstreamer: -- '1.21' icu: - '70' jpeg: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 80e60f66..587ce113 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @Tobias-Fischer @andfoy @ccordoba12 @duncanmmacleod @gillins @jschueller @matthiasdiener @mingwandroid @msarahan @ocefpaf @stuarteberg \ No newline at end of file +* @conda-forge/qt-main \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 583fbb74..1d3625b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,16 @@ matrix: arch: arm64 dist: focal + - env: CONFIG=linux_ppc64le_openssl1.1.1 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_openssl3 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + script: - export CI=travis - export GIT_BRANCH="$TRAVIS_BRANCH" diff --git a/README.md b/README.md index 0071f256..193003f1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -About qt-main +About qt-base ============= Home: https://qt.io @@ -69,6 +69,20 @@ Current build status variant + + linux_ppc64le_openssl1.1.1 + + + variant + + + + linux_ppc64le_openssl3 + + + variant + + osx_64 @@ -110,53 +124,53 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-qt--main-green.svg)](https://anaconda.org/conda-forge/qt-main) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/qt-main.svg)](https://anaconda.org/conda-forge/qt-main) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/qt-main.svg)](https://anaconda.org/conda-forge/qt-main) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/qt-main.svg)](https://anaconda.org/conda-forge/qt-main) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-qt--base-green.svg)](https://anaconda.org/conda-forge/qt-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/qt-base.svg)](https://anaconda.org/conda-forge/qt-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/qt-base.svg)](https://anaconda.org/conda-forge/qt-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/qt-base.svg)](https://anaconda.org/conda-forge/qt-base) | -Installing qt-main +Installing qt-base ================== -Installing `qt-main` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `qt-base` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `qt-main` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `qt-base` can be installed with `conda`: ``` -conda install qt-main +conda install qt-base ``` or with `mamba`: ``` -mamba install qt-main +mamba install qt-base ``` -It is possible to list all of the versions of `qt-main` available on your platform with `conda`: +It is possible to list all of the versions of `qt-base` available on your platform with `conda`: ``` -conda search qt-main --channel conda-forge +conda search qt-base --channel conda-forge ``` or with `mamba`: ``` -mamba search qt-main --channel conda-forge +mamba search qt-base --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search qt-main --channel conda-forge +mamba repoquery search qt-base --channel conda-forge -# List packages depending on `qt-main`: -mamba repoquery whoneeds qt-main --channel conda-forge +# List packages depending on `qt-base`: +mamba repoquery whoneeds qt-base --channel conda-forge -# List dependencies of `qt-main`: -mamba repoquery depends qt-main --channel conda-forge +# List dependencies of `qt-base`: +mamba repoquery depends qt-base --channel conda-forge ``` @@ -201,17 +215,17 @@ Terminology produce the finished article (built conda distributions) -Updating qt-main-feedstock +Updating qt-base-feedstock ========================== -If you would like to improve the qt-main recipe or build a new +If you would like to improve the qt-base recipe or build a new package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the `conda-forge` channel, whereupon the built conda packages will be available for everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/qt-main-feedstock are +Note that all branches in the conda-forge/qt-base-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions. @@ -226,15 +240,5 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== -* [@Tobias-Fischer](https://github.com/Tobias-Fischer/) -* [@andfoy](https://github.com/andfoy/) -* [@ccordoba12](https://github.com/ccordoba12/) -* [@duncanmmacleod](https://github.com/duncanmmacleod/) -* [@gillins](https://github.com/gillins/) -* [@jschueller](https://github.com/jschueller/) -* [@matthiasdiener](https://github.com/matthiasdiener/) -* [@mingwandroid](https://github.com/mingwandroid/) -* [@msarahan](https://github.com/msarahan/) -* [@ocefpaf](https://github.com/ocefpaf/) -* [@stuarteberg](https://github.com/stuarteberg/) +* [@conda-forge/qt-main](https://github.com/conda-forge/qt-main/)