From e1ed053bf15e99b8b8822a980017b96c9d5043f4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:45:04 +0000 Subject: [PATCH 1/5] updated v1.0.7 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d0d0931..aff7766 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.0.6" %} +{% set version = "1.0.7" %} package: name: msgpack-python @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/m/msgpack/msgpack-{{ version }}.tar.gz - sha256: 25d3746da40f3c8c59c3b1d001e49fd2aa17904438f980d9a391370366df001e + sha256: 572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87 build: number: 0 From 4a18c700a3907172800b41443e5af29af3778d5b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:45:30 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.09.28.12.41.45 --- .ci_support/migrations/python311.yaml | 37 --------------------------- 1 file changed, 37 deletions(-) delete mode 100644 .ci_support/migrations/python311.yaml diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index a75ff43..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 5 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython From 1238b20468144e5d9532157f019d180da89f506a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 20:09:59 +0000 Subject: [PATCH 3/5] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.22.15.33.15 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .azure-pipelines/azure-pipelines-win.yml | 3 +++ .../linux_64_python3.10.____cpython.yaml | 3 --- .../linux_64_python3.11.____cpython.yaml | 3 --- .../linux_64_python3.12.____cpython.yaml | 5 +---- .ci_support/linux_64_python3.8.____cpython.yaml | 3 --- .ci_support/linux_64_python3.9.____73_pypy.yaml | 3 --- .ci_support/linux_64_python3.9.____cpython.yaml | 3 --- .../linux_aarch64_python3.10.____cpython.yaml | 3 --- .../linux_aarch64_python3.11.____cpython.yaml | 3 --- .../linux_aarch64_python3.12.____cpython.yaml | 5 +---- .../linux_aarch64_python3.8.____cpython.yaml | 3 --- .../linux_aarch64_python3.9.____73_pypy.yaml | 3 --- .../linux_aarch64_python3.9.____cpython.yaml | 3 --- .../linux_ppc64le_python3.10.____cpython.yaml | 3 --- .../linux_ppc64le_python3.11.____cpython.yaml | 3 --- .../linux_ppc64le_python3.12.____cpython.yaml | 5 +---- .../linux_ppc64le_python3.8.____cpython.yaml | 3 --- .../linux_ppc64le_python3.9.____73_pypy.yaml | 3 --- .../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.12.____cpython.yaml | 7 ++----- .ci_support/osx_64_python3.8.____cpython.yaml | 5 +---- .ci_support/osx_64_python3.9.____73_pypy.yaml | 5 +---- .ci_support/osx_64_python3.9.____cpython.yaml | 5 +---- .../osx_arm64_python3.10.____cpython.yaml | 5 +---- .../osx_arm64_python3.11.____cpython.yaml | 5 +---- .../osx_arm64_python3.12.____cpython.yaml | 7 ++----- .../osx_arm64_python3.8.____cpython.yaml | 5 +---- .../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.12.____cpython.yaml | 5 +---- .ci_support/win_64_python3.8.____cpython.yaml | 3 --- .ci_support/win_64_python3.9.____73_pypy.yaml | 3 --- .ci_support/win_64_python3.9.____cpython.yaml | 3 --- .scripts/build_steps.sh | 17 +++++++++++++---- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 15 +++++++++++---- .scripts/run_win_build.bat | 12 ++++++++++-- README.md | 2 +- 43 files changed, 64 insertions(+), 133 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6c8d922..8c740f9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -93,6 +93,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2d83e68..5bfabd3 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -47,6 +47,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 752cc4d..f09740f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -57,6 +57,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 20a9934..185f425 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.10.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 2652b26..16191cd 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.11.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index c9796ce..9e52fa4 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos6 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -18,6 +18,3 @@ python: - 3.12.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 038f244..17b57e2 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.8.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index 07eedaf..ed87da3 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -18,6 +18,3 @@ python: - 3.9.* *_73_pypy target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 2603543..27b9f77 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.9.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 29fe130..d6e2c91 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -22,6 +22,3 @@ python: - 3.10.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 9127463..0f0ba66 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -22,6 +22,3 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index d7dde8c..5cef946 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -22,6 +22,3 @@ python: - 3.12.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 679a87a..d9b811a 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -22,6 +22,3 @@ python: - 3.8.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index 1226160..956b7c7 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -22,6 +22,3 @@ python: - 3.9.* *_73_pypy target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 51cb2fa..f19f8a8 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -22,6 +22,3 @@ python: - 3.9.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 211a9c5..7b0289f 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.10.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 359770e..420e846 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 18f93bc..fec943a 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -18,6 +18,3 @@ python: - 3.12.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 8bbdc5f..ed4bace 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.8.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml index cbc983c..c4760f1 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -18,6 +18,3 @@ python: - 3.9.* *_73_pypy target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 7306dc3..1f45a93 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -18,6 +18,3 @@ python: - 3.9.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index b41629d..7365e88 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.10.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 34d95ec..a25a749 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.11.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index b864d34..ebde909 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,13 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.12.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index d36f52d..ee97cfa 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.8.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index 10a2b4f..eebd0ce 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.9.* *_73_pypy target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 1d256c7..45b16b4 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.9.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 6d4a250..b759d8e 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.10.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 9634d30..f5f6eec 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 611411c..91e5d5c 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,13 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.12.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 397f703..0b575a7 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.8.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index bef1597..7d20b3b 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: @@ -18,6 +18,3 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 4829853..ba0fdd5 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -12,6 +12,3 @@ python: - 3.10.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 90aa114..cfdc622 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -12,6 +12,3 @@ python: - 3.11.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 593d9d2..ccbf966 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,5 @@ channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -12,6 +12,3 @@ python: - 3.12.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index b174432..0378f7c 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -12,6 +12,3 @@ python: - 3.8.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml index 3634fa5..0ade5a0 100644 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -12,6 +12,3 @@ python: - 3.9.* *_73_pypy target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 82d4e9b..eed2ce1 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -12,6 +12,3 @@ python: - 3.9.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - channel_sources diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 322832b..064e539 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -66,9 +74,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cd9a88f..46ab346 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,10 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..5b2b849 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -41,11 +45,15 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "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 diff --git a/README.md b/README.md index b0943ab..90e3b71 100644 --- a/README.md +++ b/README.md @@ -354,7 +354,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From 234685f2ff0d4c07fb1a84312ba4df3fbabaab62 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 22 Nov 2023 19:10:09 -0300 Subject: [PATCH 4/5] use mambabuild --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index f7aa9b9..6f0a4f2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,3 +11,4 @@ provider: linux_ppc64le: azure win: azure test_on_native_only: true +conda_build_tool: mambabuild \ No newline at end of file From 3e19d2ca26d81b41348916e1e0e398dd8c681b36 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 22 Nov 2023 19:10:10 -0300 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.22.15.33.15 --- .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 064e539..eba1dfd 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,7 +74,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" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 46ab346..9259eb9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -81,7 +81,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 \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 5b2b849..7d2fdd6 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: 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=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -53,7 +53,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