From a3e3e836f501ecffeca6515ce342d9ec256e3ba3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:48:33 +0000 Subject: [PATCH 1/3] Rebuild for python 3.13 --- .ci_support/migrations/python313.yaml | 46 +++++++++++++++++++++++++++ recipe/meta.yaml | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python313.yaml diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 0000000..f9389e3 --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,46 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + 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 + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + # see https://github.com/conda-forge/scipy-feedstock/pull/283 + - scipy + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 94f1bf5..6384761 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,12 +11,13 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 script: {{ PYTHON }} -m pip install . -vv requirements: build: - {{ compiler('cxx') }} + - {{ stdlib("c") }} host: - python From 6189682927b53026cfbd823928a66f8abf81fa8b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:49:29 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.12.08.18.46 --- .azure-pipelines/azure-pipelines-linux.yml | 13 +++-- .azure-pipelines/azure-pipelines-osx.yml | 12 +++-- .azure-pipelines/azure-pipelines-win.yml | 11 +++-- ...ux_64_numpy1.22python3.10.____cpython.yaml | 11 ++++- ...nux_64_numpy1.22python3.9.____cpython.yaml | 11 ++++- ...ux_64_numpy1.23python3.11.____cpython.yaml | 11 ++++- ...x_64_numpy1.26python3.12.____cpython.yaml} | 15 ++++-- .../linux_64_numpy2python3.13.____cp313.yaml | 32 ++++++++++++ ...sx_64_numpy1.22python3.10.____cpython.yaml | 11 ++++- ...osx_64_numpy1.22python3.9.____cpython.yaml | 11 ++++- ...sx_64_numpy1.23python3.11.____cpython.yaml | 11 ++++- ...x_64_numpy1.26python3.12.____cpython.yaml} | 15 ++++-- .../osx_64_numpy2python3.13.____cp313.yaml | 32 ++++++++++++ ...in_64_numpy1.22python3.10.____cpython.yaml | 3 ++ ...win_64_numpy1.22python3.9.____cpython.yaml | 3 ++ ...in_64_numpy1.23python3.11.____cpython.yaml | 3 ++ ...n_64_numpy1.26python3.12.____cpython.yaml} | 7 ++- .../win_64_numpy2python3.13.____cp313.yaml | 22 +++++++++ .gitattributes | 4 +- .scripts/build_steps.sh | 8 ++- .scripts/run_osx_build.sh | 11 ++++- .scripts/run_win_build.bat | 7 ++- README.md | 49 +++++++++++++------ azure-pipelines.yml | 4 +- build-locally.py | 9 ++-- 25 files changed, 267 insertions(+), 59 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.8.____cpython.yaml => linux_64_numpy1.26python3.12.____cpython.yaml} (68%) create mode 100644 .ci_support/linux_64_numpy2python3.13.____cp313.yaml rename .ci_support/{osx_64_numpy1.22python3.8.____cpython.yaml => osx_64_numpy1.26python3.12.____cpython.yaml} (66%) create mode 100644 .ci_support/osx_64_numpy2python3.13.____cp313.yaml rename .ci_support/{win_64_numpy1.22python3.8.____cpython.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (78%) create mode 100644 .ci_support/win_64_numpy2python3.13.____cp313.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 536fd7c..6cdb466 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -24,7 +20,16 @@ jobs: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2python3.13.____cp313: + CONFIG: linux_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3fd7b9..e5b6818 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,22 +5,26 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy2python3.13.____cp313: + CONFIG: osx_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index eedfd44..6ec2d16 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,15 +11,18 @@ jobs: win_64_numpy1.22python3.10.____cpython: CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.8.____cpython: - CONFIG: win_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.9.____cpython: CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy2python3.13.____cp313: + CONFIG: win_64_numpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -33,7 +36,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index ffef1ba..9d59091 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,9 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -7,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -21,5 +25,8 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 498ec18..a73cca1 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,9 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -7,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -21,5 +25,8 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index b3a05a0..9a8d329 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,9 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -7,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: @@ -21,5 +25,8 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml similarity index 68% rename from .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 583ed7e..19792df 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,9 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -7,19 +11,22 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..d8599e4 --- /dev/null +++ b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,32 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index cd0d61d..9c9ca2d 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -7,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -23,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index f5582a2..a97d451 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -7,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -23,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 000f0a0..e98b33e 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -7,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -23,3 +29,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml similarity index 66% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 21ad211..87eb658 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -7,19 +13,20 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - osx-64 zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..8cdf35d --- /dev/null +++ b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,32 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '17' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- osx-64 +zip_keys: +- - python + - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 9242573..3a56f30 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,3 +1,5 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -17,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 54752e7..9a0d0b0 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,3 +1,5 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -17,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index caea98b..25344fb 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,3 +1,5 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -17,3 +19,4 @@ target_platform: zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 78% rename from .ci_support/win_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index d2b260a..7fd3b0c 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,3 +1,5 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -5,15 +7,16 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - win-64 zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml new file mode 100644 index 0000000..42961e7 --- /dev/null +++ b/.ci_support/win_64_numpy2python3.13.____cp313.yaml @@ -0,0 +1,22 @@ +c_stdlib: +- vs +channel_sources: +- conda-forge/label/python_rc,conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - channel_sources diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a4d638b..6c805a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -65,10 +65,16 @@ 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-build "${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:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 2879be2..4ebc38f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -77,10 +77,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then /bin/bash else - conda build ./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 \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( 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 a5871f6..24ef201 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -50,9 +50,14 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index 3d7b9ad..068a17a 100644 --- a/README.md +++ b/README.md @@ -45,38 +45,38 @@ Current build status - linux_64_numpy1.22python3.8.____cpython + linux_64_numpy1.22python3.9.____cpython - variant + variant - linux_64_numpy1.22python3.9.____cpython + linux_64_numpy1.23python3.11.____cpython - variant + variant - linux_64_numpy1.23python3.11.____cpython + linux_64_numpy1.26python3.12.____cpython - variant + variant - osx_64_numpy1.22python3.10.____cpython + linux_64_numpy2python3.13.____cp313 - variant + variant - osx_64_numpy1.22python3.8.____cpython + osx_64_numpy1.22python3.10.____cpython - variant + variant @@ -94,17 +94,24 @@ Current build status - win_64_numpy1.22python3.10.____cpython + osx_64_numpy1.26python3.12.____cpython - variant + variant - win_64_numpy1.22python3.8.____cpython + osx_64_numpy2python3.13.____cp313 - variant + variant + + + + win_64_numpy1.22python3.10.____cpython + + + variant @@ -121,6 +128,20 @@ Current build status variant + + win_64_numpy1.26python3.12.____cpython + + + variant + + + + win_64_numpy2python3.13.____cp313 + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index e0d408d..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 9efa9afcee3e823fbcd0363c1fbf44e61512d8d1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Sat, 14 Sep 2024 12:07:01 -0500 Subject: [PATCH 3/3] Include setuptools in host dependencies. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6384761..adafcb7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ requirements: host: - python - pip + - setuptools - cython - numpy