From ddae74724f3527d18422bb34dabb945a0ad7bcb9 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 24 Oct 2023 14:23:21 -0300 Subject: [PATCH 1/4] Set version to 5.13.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ba0f237..d9476c2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "pyinstaller" %} -{% set version = "6.0.0" %} -{% set sha256 = "d702cff041f30e7a53500b630e07b081e5328d4655023319253d73935e75ade2" %} +{% set version = "5.13.2" %} +{% set sha256 = "c8e5d3489c3a7cc5f8401c2d1f48a70e588f9967e391c3b06ddac1f685f8d5d2" %} package: name: {{ name.lower() }} From bde3ecd42eb0dab65215a5c82de1791ee46283de Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Tue, 24 Oct 2023 15:51:16 -0300 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.23.08.51.53 --- .ci_support/linux_64_python3.10.____cpython.yaml | 3 --- .ci_support/linux_64_python3.11.____cpython.yaml | 3 --- .ci_support/linux_64_python3.8.____cpython.yaml | 3 --- .ci_support/linux_64_python3.9.____cpython.yaml | 3 --- .ci_support/linux_aarch64_python3.10.____cpython.yaml | 3 --- .ci_support/linux_aarch64_python3.11.____cpython.yaml | 3 --- .ci_support/linux_aarch64_python3.8.____cpython.yaml | 3 --- .ci_support/linux_aarch64_python3.9.____cpython.yaml | 3 --- .ci_support/linux_ppc64le_python3.10.____cpython.yaml | 3 --- .ci_support/linux_ppc64le_python3.11.____cpython.yaml | 3 --- .ci_support/linux_ppc64le_python3.8.____cpython.yaml | 3 --- .ci_support/linux_ppc64le_python3.9.____cpython.yaml | 3 --- .ci_support/osx_64_python3.10.____cpython.yaml | 5 +---- .ci_support/osx_64_python3.11.____cpython.yaml | 5 +---- .ci_support/osx_64_python3.8.____cpython.yaml | 5 +---- .ci_support/osx_64_python3.9.____cpython.yaml | 5 +---- .ci_support/osx_arm64_python3.10.____cpython.yaml | 5 +---- .ci_support/osx_arm64_python3.11.____cpython.yaml | 5 +---- .ci_support/osx_arm64_python3.8.____cpython.yaml | 5 +---- .ci_support/osx_arm64_python3.9.____cpython.yaml | 5 +---- .ci_support/win_64_python3.10.____cpython.yaml | 3 --- .ci_support/win_64_python3.11.____cpython.yaml | 3 --- .ci_support/win_64_python3.8.____cpython.yaml | 3 --- .ci_support/win_64_python3.9.____cpython.yaml | 3 --- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 26 files changed, 10 insertions(+), 82 deletions(-) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index f026c6c..a8cea3b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.10.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index b20af11..2596608 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.11.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index b718f3b..5c6d2d4 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.8.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 7aaaf83..22fe2fb 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.9.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index f971415..fc87d14 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -22,8 +22,5 @@ python: - 3.10.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index ef52ae9..5b364e3 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -22,8 +22,5 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 0c8d3e4..927beed 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -22,8 +22,5 @@ python: - 3.8.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index d39b539..a38aee4 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -22,8 +22,5 @@ python: - 3.9.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index f021f1f..ea08aef 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.10.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 5b07ee4..e028b75 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index f40b2f4..95ea8fc 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.8.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 606941e..3206f07 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -18,8 +18,5 @@ python: - 3.9.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 50ebe69..805313e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.10.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index e5f24a2..ab643e2 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.11.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index d83dc98..4c5b88e 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.8.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 96da992..42f8c99 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.9.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 77536c1..66f087b 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.10.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 86835ec..b69038c 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 7872a56..32aa90f 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.8.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index ea2ad6c..170a08a 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -18,8 +18,5 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index b6b8b23..6260f3b 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -12,8 +12,5 @@ python: - 3.10.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 3c1028c..0c8009e 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -12,8 +12,5 @@ python: - 3.11.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 93f84b6..f452eaa 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -12,8 +12,5 @@ python: - 3.8.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 3e1e50d..30387d6 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -12,8 +12,5 @@ python: - 3.9.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources zlib: - '1.2' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 919d7fa..8a32b22 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,7 +34,7 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=3 # 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 688da22..bcab494 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ conda activate base mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ pip mamba conda-build conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=3 From 7187011b94c7040bf3a45b8fa51c04f0cde47691 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 26 Oct 2023 20:36:44 -0500 Subject: [PATCH 3/4] Update conda-forge.yml --- conda-forge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index a1f9074..ebe8ae6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,5 @@ build_platform: osx_arm64: osx_64 -build_with_mambabuild: false conda_build: pkg_format: '2' conda_forge_output_validation: true From 9421fb3c2997b97ad0e840cfad3944eefd464fd0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:39:12 +0000 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.26.22.51.41 --- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8a32b22..bd9e671 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -32,9 +32,9 @@ pkgs_dirs: CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -66,7 +66,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bcab494..870c49a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=3 @@ -75,7 +75,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 288d62d..07d3445 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -20,7 +20,7 @@ call activate base :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -45,7 +45,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step