From 83fbd52a47b8a01df98326e128f672dfea008e88 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 15 Nov 2022 06:58:49 +0000 Subject: [PATCH 1/3] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0e6c8c19d..79bf527d1 100644 --- a/README.md +++ b/README.md @@ -270,3 +270,6 @@ Feedstock Maintainers * [@scopatz](https://github.com/scopatz/) * [@xhochy](https://github.com/xhochy/) + + + From cc1cc2b039bf3f253c730cbed149a46e1c6ad085 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 14 Nov 2022 23:00:24 -0800 Subject: [PATCH 2/3] Delete CircleCI config from `recipe` --- recipe/.circleci/config.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 recipe/.circleci/config.yml diff --git a/recipe/.circleci/config.yml b/recipe/.circleci/config.yml deleted file mode 100644 index 6ad461b80..000000000 --- a/recipe/.circleci/config.yml +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -version: 2 - -jobs: - build: - working_directory: ~/test - machine: true - steps: - - run: - # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. - command: exit 0 - -workflows: - version: 2 - build_and_test: - jobs: - - build: - filters: - branches: - ignore: - - /.*/ From fca8c2e3be643dc3293a15258f0109de48d833b0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 07:04:38 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.14.21.30.17 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_openssl1.1.1.yaml | 18 +------------ .ci_support/linux_64_openssl3.yaml | 18 +------------ .ci_support/linux_aarch64_openssl1.1.1.yaml | 18 +------------ .ci_support/linux_aarch64_openssl3.yaml | 18 +------------ .ci_support/linux_ppc64le_openssl1.1.1.yaml | 16 +----------- .ci_support/linux_ppc64le_openssl3.yaml | 16 +----------- .ci_support/osx_64_openssl1.1.1.yaml | 16 +----------- .ci_support/osx_64_openssl3.yaml | 16 +----------- .ci_support/osx_arm64_openssl1.1.1.yaml | 16 +----------- .ci_support/osx_arm64_openssl3.yaml | 16 +----------- .ci_support/win_64_openssl1.1.1.yaml | 18 +++---------- .ci_support/win_64_openssl3.yaml | 18 +++---------- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +-- .scripts/run_osx_build.sh | 5 ++-- README.md | 28 ++++++++++----------- 17 files changed, 35 insertions(+), 210 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6064ce299..73c1cfe04 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -40,7 +40,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml index 0de656751..d7c0d29f9 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -25,25 +25,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -55,7 +39,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml index 181f33b81..f05bad666 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -25,25 +25,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -55,7 +39,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml index 51779afc5..8ee884736 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -29,25 +29,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -59,7 +43,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml index 53e3b515c..8ac432ddb 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -29,25 +29,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -59,7 +43,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml index c63c1ce62..46a84a3a6 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -25,23 +25,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -51,7 +37,7 @@ sqlite: target_platform: - linux-ppc64le xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml index 4650156c2..8339c7e52 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -25,23 +25,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - libuuid: - max_pin: x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -51,7 +37,7 @@ sqlite: target_platform: - linux-ppc64le xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml index bfb796d36..4a7343add 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -25,23 +25,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -53,7 +39,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml index cd767ce39..039e6f12b 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -25,23 +25,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -53,7 +39,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_openssl1.1.1.yaml b/.ci_support/osx_arm64_openssl1.1.1.yaml index 2f40f85eb..fd547a5ef 100644 --- a/.ci_support/osx_arm64_openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1.yaml @@ -23,23 +23,9 @@ ncurses: openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -51,7 +37,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_openssl3.yaml b/.ci_support/osx_arm64_openssl3.yaml index 7e6939bd0..d1fd39903 100644 --- a/.ci_support/osx_arm64_openssl3.yaml +++ b/.ci_support/osx_arm64_openssl3.yaml @@ -23,23 +23,9 @@ ncurses: openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' readline: @@ -51,7 +37,7 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/win_64_openssl1.1.1.yaml b/.ci_support/win_64_openssl1.1.1.yaml index bac103486..d8b7a7367 100644 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -1,33 +1,21 @@ bzip2: - '1' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 libffi: - '3.4' openssl: - 1.1.1 pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' sqlite: @@ -37,6 +25,6 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zlib: - '1.2' diff --git a/.ci_support/win_64_openssl3.yaml b/.ci_support/win_64_openssl3.yaml index 12fd79358..d4b6ff732 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_openssl3.yaml @@ -1,33 +1,21 @@ bzip2: - '1' c_compiler: -- vs2017 +- vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 libffi: - '3.4' openssl: - '3' pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x python: min_pin: x.x max_pin: x.x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x python: - '3.11' sqlite: @@ -37,6 +25,6 @@ target_platform: tk: - '8.6' xz: -- '5.2' +- '5' zlib: - '1.2' diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa24d..8b4ef2f99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b4367e4fd..bf8c78c27 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a09..b3abaeb54 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 79bf527d1..87fc79f0d 100644 --- a/README.md +++ b/README.md @@ -49,84 +49,84 @@ Current build status linux_64_openssl1.1.1 - variant + variant linux_64_openssl3 - variant + variant linux_aarch64_openssl1.1.1 - variant + variant linux_aarch64_openssl3 - variant + variant linux_ppc64le_openssl1.1.1 - variant + variant linux_ppc64le_openssl3 - variant + variant osx_64_openssl1.1.1 - variant + variant osx_64_openssl3 - variant + variant osx_arm64_openssl1.1.1 - variant + variant osx_arm64_openssl3 - variant + variant win_64_openssl1.1.1 - variant + variant win_64_openssl3 - variant + variant @@ -259,6 +259,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@chrisburr](https://github.com/chrisburr/) * [@isuruf](https://github.com/isuruf/) * [@jakirkham](https://github.com/jakirkham/) * [@katietz](https://github.com/katietz/) @@ -270,6 +271,3 @@ Feedstock Maintainers * [@scopatz](https://github.com/scopatz/) * [@xhochy](https://github.com/xhochy/) - - -