From 3e05f33b0427f6fa0fd37dac64d92352d207786f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 5 Sep 2022 18:46:42 +0000 Subject: [PATCH 1/4] updated v3.10.7 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa9365803..f76fe3ad9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.10.6" %} +{% set version = "3.10.7" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -47,7 +47,7 @@ source: {% else %} - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/ - md5: afc7e14f7118d10d1ba95ae8e2134bf0 + md5: b8094f007b3a835ca3be6bdf8116cccc {% endif %} patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch From d3dbe48bb29112160fbb221a1a51452794dba647 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 5 Sep 2022 18:47:14 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.15.41.14 --- .ci_support/osx_64_openssl1.1.1.yaml | 4 ++-- .ci_support/osx_64_openssl3.yaml | 4 ++-- .ci_support/osx_arm64_openssl1.1.1.yaml | 4 ++-- .ci_support/osx_arm64_openssl3.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml index e6ed76863..632314b1c 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libffi: - '3.4' macos_machine: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml index bf42f05d1..fc5cdd5a0 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libffi: - '3.4' macos_machine: diff --git a/.ci_support/osx_arm64_openssl1.1.1.yaml b/.ci_support/osx_arm64_openssl1.1.1.yaml index 858cef425..2d74b56cf 100644 --- a/.ci_support/osx_arm64_openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libffi: - '3.4' macos_machine: diff --git a/.ci_support/osx_arm64_openssl3.yaml b/.ci_support/osx_arm64_openssl3.yaml index 849733501..68912005f 100644 --- a/.ci_support/osx_arm64_openssl3.yaml +++ b/.ci_support/osx_arm64_openssl3.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libffi: - '3.4' macos_machine: From 55707abfb83b6aada29a8582a541f10d93b934e0 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 14:57:56 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.15.11.53.06 --- .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 | 14 +----------- .ci_support/win_64_openssl3.yaml | 14 +----------- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 24 ++++++++++----------- 17 files changed, 30 insertions(+), 203 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 b386615ac..20b6175ba 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.10' 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 7af84d3d0..b8ca40aa7 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.10' 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 171b2ec77..212803b41 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.10' 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 000143489..c0e956fc9 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.10' 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 eaa4c0348..6781dab5d 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.10' 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 e9b1c05ae..a24709994 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.10' 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 632314b1c..693ec2ee3 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.10' 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 fc5cdd5a0..3486a499e 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.10' 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 2d74b56cf..acdcc8fec 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.10' 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 68912005f..29c0d862c 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.10' 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 36a83ca0f..b4b3f8e04 100644 --- a/.ci_support/win_64_openssl1.1.1.yaml +++ b/.ci_support/win_64_openssl1.1.1.yaml @@ -13,21 +13,9 @@ libffi: 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.10' 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 14b82dcae..67ada216a 100644 --- a/.ci_support/win_64_openssl3.yaml +++ b/.ci_support/win_64_openssl3.yaml @@ -13,21 +13,9 @@ libffi: 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.10' 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 0e6c8c19d..c619029de 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 From 9c01024d3d807b504644fabef687f46c387040d3 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:19:16 +0000 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 3.23.1, conda-smithy 3.22.0, and conda-forge-pinning 2022.11.21.08.56.08