diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1443bee..1aec63b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,66 +8,66 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy2.0python3.10.____cpython: - CONFIG: linux_64_numpy2.0python3.10.____cpython + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.11.____cpython: - CONFIG: linux_64_numpy2.0python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.12.____cpython: - CONFIG: linux_64_numpy2.0python3.12.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2.0python3.9.____cpython: - CONFIG: linux_64_numpy2.0python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_64_python3.13.____cp313: + CONFIG: linux_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy2python3.13.____cp313: - CONFIG: linux_64_numpy2python3.13.____cp313 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_64_python3.14.____cp314: + CONFIG: linux_64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.10.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.10.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.11.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.12.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.12.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2.0python3.9.____cpython: - CONFIG: linux_aarch64_numpy2.0python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_python3.13.____cp313: + CONFIG: linux_aarch64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy2python3.13.____cp313: - CONFIG: linux_aarch64_numpy2python3.13.____cp313 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_aarch64_python3.14.____cp314: + CONFIG: linux_aarch64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.10.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_python3.10.____cpython: + CONFIG: linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.11.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.12.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2.0python3.9.____cpython: - CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_python3.13.____cp313: + CONFIG: linux_ppc64le_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy2python3.13.____cp313: - CONFIG: linux_ppc64le_numpy2python3.13.____cp313 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + linux_ppc64le_python3.14.____cp314: + CONFIG: linux_ppc64le_python3.14.____cp314 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} @@ -97,4 +97,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f1d5a74..4fe86f5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,38 +5,38 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: - osx_64_numpy2.0python3.10.____cpython: - CONFIG: osx_64_numpy2.0python3.10.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.11.____cpython: - CONFIG: osx_64_numpy2.0python3.11.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.12.____cpython: - CONFIG: osx_64_numpy2.0python3.12.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.9.____cpython: - CONFIG: osx_64_numpy2.0python3.9.____cpython + osx_64_python3.13.____cp313: + CONFIG: osx_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - osx_64_numpy2python3.13.____cp313: - CONFIG: osx_64_numpy2python3.13.____cp313 + osx_64_python3.14.____cp314: + CONFIG: osx_64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.10.____cpython: - CONFIG: osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.11.____cpython: - CONFIG: osx_arm64_numpy2.0python3.11.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.12.____cpython: - CONFIG: osx_arm64_numpy2.0python3.12.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.9.____cpython: - CONFIG: osx_arm64_numpy2.0python3.9.____cpython + osx_arm64_python3.13.____cp313: + CONFIG: osx_arm64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2python3.13.____cp313: - CONFIG: osx_arm64_numpy2python3.13.____cp313 + osx_arm64_python3.14.____cp314: + CONFIG: osx_arm64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} @@ -61,4 +61,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 900e757..2adcb90 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,49 +8,35 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy2.0python3.10.____cpython: - CONFIG: win_64_numpy2.0python3.10.____cpython + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.11.____cpython: - CONFIG: win_64_numpy2.0python3.11.____cpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.12.____cpython: - CONFIG: win_64_numpy2.0python3.12.____cpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy2.0python3.9.____cpython: - CONFIG: win_64_numpy2.0python3.9.____cpython + win_64_python3.13.____cp313: + CONFIG: win_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' - win_64_numpy2python3.13.____cp313: - CONFIG: win_64_numpy2python3.13.____cp313 + win_64_python3.14.____cp314: + CONFIG: win_64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + MINIFORGE_HOME: D:\Miniforge UPLOAD_TEMP: D:\\tmp steps: - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - 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) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - script: | call ".scripts\run_win_build.bat" displayName: Run Windows build env: + MINIFORGE_HOME: $(MINIFORGE_HOME) + CONDA_BLD_PATH: $(CONDA_BLD_PATH) PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure @@ -61,4 +47,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2python3.13.____cp313.yaml deleted file mode 100644 index 1579b67..0000000 --- a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -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 -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -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 -zlib: -- '1' diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 77% rename from .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index 158627e..2368524 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 77% rename from .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index 54e8f31..a060468 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 77% rename from .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 64da12c..8458bd6 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml similarity index 73% rename from .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_64_python3.13.____cp313.yaml index 895b515..fbed249 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -1,38 +1,35 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_python3.14.____cp314.yaml b/.ci_support/linux_64_python3.14.____cp314.yaml new file mode 100644 index 0000000..185a70c --- /dev/null +++ b/.ci_support/linux_64_python3.14.____cp314.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.14.* *_cp314 +target_platform: +- linux-64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml deleted file mode 100644 index 3451d18..0000000 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ /dev/null @@ -1,42 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml deleted file mode 100644 index e39317f..0000000 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ /dev/null @@ -1,42 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml deleted file mode 100644 index 97351de..0000000 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ /dev/null @@ -1,42 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 462d512..0000000 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,42 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml deleted file mode 100644 index 6999230..0000000 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,42 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge/label/python_rc,conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml new file mode 100644 index 0000000..d0fbeef --- /dev/null +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml new file mode 100644 index 0000000..1baf9e8 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml new file mode 100644 index 0000000..ffefdf3 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml new file mode 100644 index 0000000..949e0f7 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_python3.14.____cp314.yaml b/.ci_support/linux_aarch64_python3.14.____cp314.yaml new file mode 100644 index 0000000..c99e43a --- /dev/null +++ b/.ci_support/linux_aarch64_python3.14.____cp314.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.14.* *_cp314 +target_platform: +- linux-aarch64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml deleted file mode 100644 index f04da05..0000000 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -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 -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- linux-ppc64le -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml similarity index 77% rename from .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.10.____cpython.yaml index 65067c9..6198da9 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml similarity index 77% rename from .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpython.yaml index a33f629..50d1a3d 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml similarity index 77% rename from .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.12.____cpython.yaml index cc92723..3a7b7c7 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,25 +1,25 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -29,10 +29,7 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml similarity index 74% rename from .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.13.____cp313.yaml index 351eba8..f74e370 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -1,38 +1,35 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 jasper: - '4' libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_cpython +- 3.13.* *_cp313 target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.14.____cp314.yaml b/.ci_support/linux_ppc64le_python3.14.____cp314.yaml new file mode 100644 index 0000000..f387ebc --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.14.____cp314.yaml @@ -0,0 +1,35 @@ +c_compiler: +- gcc +c_compiler_version: +- '14' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.14.* *_cp314 +target_platform: +- linux-ppc64le +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml deleted file mode 100644 index b620607..0000000 --- a/.ci_support/migrations/numpy2.yaml +++ /dev/null @@ -1,74 +0,0 @@ -__migrator: - build_number: 1 - kind: version - commit_message: | - Rebuild for numpy 2.0 - - TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot - PR has updated the recipe to account for the changes (see below for details). - The numpy 2.0 package itself is currently only available from a special release - channel (`conda-forge/label/numpy_rc`) and will not be available on the main - `conda-forge` channel until the release of numpy 2.0 GA. - - The biggest change is that we no longer need to use the oldest available numpy - version at build time in order to support old numpy version at runtime - numpy - will by default use a compatible ABI for the oldest still-supported numpy versions. - - Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a - run requirement - this has been handled for more than two years now by a - run-export on the numpy package itself. The migrator will therefore remove - any occurrences of this. - - However, by default, building against numpy 2.0 will assume that the package - is compatible with numpy 2.0, which is not necessarily the case. You should - check that the upstream package explicitly supports numpy 2.0, otherwise you - need to add a `- numpy <2` run requirement until that happens (check numpy - issue 26191 for an overview of the most important packages). - - Note that the numpy release candidate promises to be ABI-compatible with the - final 2.0 release. This means that building against 2.0.0rc1 produces packages - that can be published to our main channels. - - If you already want to use the numpy 2.0 release candidate yourself, you can do - ``` - conda config --add channels conda-forge/label/numpy_rc - ``` - or add this channel to your `.condarc` file directly. - - ### To-Dos: - * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) - * If upstream is not yet compatible with numpy 2.0, add `numpy <2` upper bound under `run:`. - * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. - * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. - * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. - - PS. If the build does not compile anymore, this is almost certainly a sign that - the upstream project is not yet ready for numpy 2.0; do not close this PR until - a version compatible with numpy 2.0 has been released upstream and on this - feedstock (in the meantime, you can keep the bot from reopening this PR in - case of git conflicts by marking it as a draft). - - migration_number: 1 - exclude: - # needs local overrides that get stomped on by the migrator, which then fails - - scipy - # already done, but thinks its unsolvable - - pandas - ordering: - # prefer channels including numpy_rc (otherwise smithy doesn't - # know which of the two values should be taken on merge) - channel_sources: - - conda-forge - - conda-forge/label/numpy_rc,conda-forge - -# needs to match length of zip {python, python_impl, numpy} -# as it is in global CBC in order to override it -numpy: - - 1.22 # no py38 support for numpy 2.0 - - 2.0 - - 2.0 - - 2.0 - - 2.0 -channel_sources: - - conda-forge/label/numpy_rc,conda-forge -migrator_ts: 1713572489.295986 diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml deleted file mode 100644 index b39b1bb..0000000 --- a/.ci_support/migrations/python312.yaml +++ /dev/null @@ -1,38 +0,0 @@ -migrator_ts: 1695046563 -__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 - - 3.12.* *_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: 30 - max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 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.12.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.26 -python_impl: - - cpython diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python314.yaml similarity index 56% rename from .ci_support/migrations/python313.yaml rename to .ci_support/migrations/python314.yaml index 92cc90b..36ec6b4 100644 --- a/.ci_support/migrations/python313.yaml +++ b/.ci_support/migrations/python314.yaml @@ -1,26 +1,24 @@ +# this is intentionally sorted before the 3.13t migrator, because that determines +# the order of application of the migrators; otherwise we'd have to add values for +# is_freethreading and is_abi3 keys here, since that migration extends the zip; migrator_ts: 1724712607 __migrator: - commit_message: Rebuild for python 3.13 + commit_message: Rebuild for python 3.14 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 + - 3.13.* *_cp313 + - 3.13.* *_cp313t + - 3.14.* *_cp314 # new entry paused: false longterm: true - pr_limit: 20 + pr_limit: 5 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 @@ -30,15 +28,16 @@ __migrator: - cross-python - python_abi exclude_pinned_pkgs: false + ignored_deps_per_node: + matplotlib: + - pyqt additional_zip_keys: - channel_sources python: -- 3.13.* *_cp313 -channel_sources: -- conda-forge/label/python_rc,conda-forge +- 3.14.* *_cp314 # additional entries to add for zip_keys -numpy: -- 2 -python_impl: -- cpython +is_python_min: +- false +channel_sources: +- conda-forge,conda-forge/label/python_rc diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2python3.13.____cp313.yaml deleted file mode 100644 index 38a3dee..0000000 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge/label/python_rc,conda-forge -channel_targets: -- conda-forge main -jasper: -- '4' -libpng: -- '1.6' -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 -zlib: -- '1' diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index c3f017f..b1b7871 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index a988a27..39fd526 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index d2eb185..4ad112b 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml similarity index 91% rename from .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.13.____cp313.yaml index d141477..e6e51ce 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,18 +21,17 @@ libpng: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.14.____cp314.yaml b/.ci_support/osx_64_python3.14.____cp314.yaml new file mode 100644 index 0000000..5c4ac66 --- /dev/null +++ b/.ci_support/osx_64_python3.14.____cp314.yaml @@ -0,0 +1,37 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '19' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +jasper: +- '4' +libpng: +- '1.6' +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.14.* *_cp314 +target_platform: +- osx-64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml deleted file mode 100644 index 3fe7d19..0000000 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge/label/python_rc,conda-forge -channel_targets: -- conda-forge main -jasper: -- '4' -libpng: -- '1.6' -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- osx-arm64 -zip_keys: -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index 3bf9291..10db432 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-arm64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index af95784..78136d1 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-arm64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index 27bda5e..d960fb6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ libpng: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -32,7 +32,6 @@ target_platform: - osx-arm64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.13.____cp313.yaml index 354a9df..e87a43d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,18 +21,17 @@ libpng: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_cpython +- 3.13.* *_cp313 target_platform: - osx-arm64 zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.14.____cp314.yaml b/.ci_support/osx_arm64_python3.14.____cp314.yaml new file mode 100644 index 0000000..9151a0b --- /dev/null +++ b/.ci_support/osx_arm64_python3.14.____cp314.yaml @@ -0,0 +1,37 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '19' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +jasper: +- '4' +libpng: +- '1.6' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.14.* *_cp314 +target_platform: +- osx-arm64 +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_numpy2python3.13.____cp313.yaml deleted file mode 100644 index d9959f4..0000000 --- a/.ci_support/win_64_numpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,30 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge/label/python_rc,conda-forge -channel_targets: -- conda-forge main -jasper: -- '4' -libpng: -- '1.6' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- win-64 -vc: -- '14' -zip_keys: -- - python - - numpy - - channel_sources -zlib: -- '1' diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 91% rename from .ci_support/win_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml index db0ce5b..1738307 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ jasper: libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -24,7 +24,6 @@ vc: - '14' zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 91% rename from .ci_support/win_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml index c217fb8..3fbda1e 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ jasper: libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -24,7 +24,6 @@ vc: - '14' zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 91% rename from .ci_support/win_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index fdf1c05..19ed5fb 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ jasper: libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x @@ -24,7 +24,6 @@ vc: - '14' zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_python3.13.____cp313.yaml similarity index 86% rename from .ci_support/win_64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/win_64_python3.13.____cp313.yaml index fa2645f..35754af 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,20 +11,19 @@ jasper: libpng: - '1.6' numpy: -- '2.0' +- '2' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.9.* *_cpython +- 3.13.* *_cp313 target_platform: - win-64 vc: - '14' zip_keys: - - python - - numpy - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.14.____cp314.yaml b/.ci_support/win_64_python3.14.____cp314.yaml new file mode 100644 index 0000000..162d603 --- /dev/null +++ b/.ci_support/win_64_python3.14.____cp314.yaml @@ -0,0 +1,29 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge,conda-forge/label/python_rc +channel_targets: +- conda-forge main +jasper: +- '4' +libpng: +- '1.6' +numpy: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.14.* *_cp314 +target_platform: +- win-64 +vc: +- '14' +zip_keys: +- - python + - channel_sources +zlib: +- '1' diff --git a/.gitattributes b/.gitattributes index 18f114a..85ccb8f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,4 +24,5 @@ bld.bat text eol=crlf /README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true +pixi.toml linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index 179afe5..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..780a358 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" 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 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -74,8 +76,8 @@ else --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" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null @@ -95,4 +97,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 00f377a..b63b5a0 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -12,7 +12,7 @@ source .scripts/logging_utils.sh set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" +PROVIDER_DIR="$(basename "$THISDIR")" FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" @@ -111,4 +111,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..361edeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,29 +6,41 @@ source .scripts/logging_utils.sh set -xe -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="Miniforge3-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +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 conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +100,8 @@ else ( 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" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null @@ -105,4 +117,4 @@ else fi ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file +fi diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..27c552b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -3,30 +3,51 @@ :: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also :: benefit from the improvement. -:: Note: we assume a Miniforge installation is available - :: INPUTS (required environment variables) :: CONFIG: name of the .ci_support/*.yaml file for this job :: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment :: UPLOAD_PACKAGES: true or false :: UPLOAD_ON_BRANCH: true or false setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +powershell -ExecutionPolicy Bypass -Command "(New-Object Net.WebClient).DownloadFile('%MICROMAMBA_URL%', '%MICROMAMBA_EXE%')" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" >nul +del /S /Q "%MICROMAMBA_TMPDIR%" >nul +call :end_group + call :start_group "Configuring conda" :: Activate the base conda environment -call activate base +echo Activating environment +call "%MINIFORGE_HOME%\Scripts\activate.bat" :: 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 conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - :: Set basic configuration echo Setting up configuration setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml @@ -48,7 +69,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) 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%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group @@ -59,8 +80,8 @@ conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTR 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" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" call :end_group :: Prepare some environment variables for the upload step @@ -127,4 +148,4 @@ if /i "%CI%" == "azure" ( echo ##[endgroup] exit /b ) -exit /b \ No newline at end of file +exit /b diff --git a/README.md b/README.md index 2732ee4..e013f5e 100644 --- a/README.md +++ b/README.md @@ -31,213 +31,213 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..eff4ad6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - 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 8ac9b84..9dfe440 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. @@ -10,6 +10,7 @@ import os import platform import subprocess +import sys from argparse import ArgumentParser @@ -26,6 +27,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" @@ -37,10 +45,19 @@ def run_osx_build(ns): subprocess.check_call([script]) +def run_win_build(ns): + script = ".scripts/run_win_build.bat" + subprocess.check_call(["cmd", "/D", "/Q", "/C", f"CALL {script}"]) + + def verify_config(ns): + choices_filter = ns.filter or "*" valid_configs = { - os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + os.path.basename(f)[:-5] + for f in glob.glob(f".ci_support/{choices_filter}.yaml") } + if choices_filter != "*": + print(f"filtering for '{choices_filter}.yaml' configs") print(f"valid configs are {valid_configs}") if ns.config in valid_configs: print("Using " + ns.config + " configuration") @@ -53,38 +70,43 @@ def verify_config(ns): selections = list(enumerate(sorted(valid_configs), 1)) for i, c in selections: print(f"{i}. {c}") - s = input("\n> ") + try: + s = input("\n> ") + except KeyboardInterrupt: + print("\nno option selected, bye!", file=sys.stderr) + sys.exit(1) idx = int(s) - 1 ns.config = selections[idx][1] print(f"selected {ns.config}") else: raise ValueError("config " + ns.config + " is not valid") - # Remove the following, as implemented - if ns.config.startswith("win"): - raise ValueError( - f"only Linux/macOS configs currently supported, got {ns.config}" + if ( + ns.config.startswith("osx") + and platform.system() == "Darwin" + and not os.environ.get("OSX_SDK_DIR") + ): + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) - elif ns.config.startswith("osx"): - if "OSX_SDK_DIR" not in os.environ: - raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " - "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " - "Note: OSX_SDK_DIR must be set to an absolute path. " - "Setting this variable implies agreement to the licensing terms of the SDK by Apple." - ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--filter", + default=None, + help="Glob string to filter which build choices are presented in interactive mode.", + ) p.add_argument( "--debug", action="store_true", help="Setup debug environment using `conda debug`", ) - p.add_argument( - "--output-id", help="If running debug, specify the output to setup." - ) + p.add_argument("--output-id", help="If running debug, specify the output to setup.") ns = p.parse_args(args=args) verify_config(ns) @@ -97,10 +119,10 @@ def main(args=None): run_docker_build(ns) elif ns.config.startswith("osx"): run_osx_build(ns) + elif ns.config.startswith("win"): + run_win_build(ns) finally: - recipe_license_file = os.path.join( - "recipe", "recipe-scripts-license.txt" - ) + recipe_license_file = os.path.join("recipe", "recipe-scripts-license.txt") if os.path.exists(recipe_license_file): os.remove(recipe_license_file) diff --git a/recipe/fix-new-cython.patch b/recipe/fix-new-cython.patch new file mode 100644 index 0000000..a665907 --- /dev/null +++ b/recipe/fix-new-cython.patch @@ -0,0 +1,18 @@ +commit 915715d493b32295416783e151aa42e0b27c45df +Author: Tim Chan +Date: Wed May 14 12:23:59 2025 -0700 + + issue265-arm64 from ctypes import c_long as long + +diff --git a/src/pygrib/_pygrib.pyx b/src/pygrib/_pygrib.pyx +index d0fc6bc..828178e 100644 +--- a/src/pygrib/_pygrib.pyx ++++ b/src/pygrib/_pygrib.pyx +@@ -5,6 +5,7 @@ __version__ = '2.1.6' + import numpy as np + cimport numpy as npc + cimport cython ++from ctypes import c_long as long + import warnings + import os + from datetime import datetime diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db510be..e118070 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,9 +7,11 @@ package: source: url: https://github.com/jswhit/pygrib/archive/v{{ version }}rel.tar.gz sha256: 4466c9b2c8f4e5a45df1fa3b733697bba8e1cc31aba0f8aae8cfd3890e48aae3 + patches: + - fix-new-cython.patch build: - number: 1 + number: 2 skip: true # [win and vc<14] requirements:
VariantStatus
linux_64_numpy2.0python3.10.____cpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_numpy2.0python3.11.____cpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_numpy2.0python3.12.____cpythonlinux_64_python3.12.____cpython - variant + variant
linux_64_numpy2.0python3.9.____cpythonlinux_64_python3.13.____cp313 - variant + variant
linux_64_numpy2python3.13.____cp313linux_64_python3.14.____cp314 - variant + variant
linux_aarch64_numpy2.0python3.10.____cpythonlinux_aarch64_python3.10.____cpython - variant + variant
linux_aarch64_numpy2.0python3.11.____cpythonlinux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_numpy2.0python3.12.____cpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_aarch64_numpy2.0python3.9.____cpythonlinux_aarch64_python3.13.____cp313 - variant + variant
linux_aarch64_numpy2python3.13.____cp313linux_aarch64_python3.14.____cp314 - variant + variant
linux_ppc64le_numpy2.0python3.10.____cpythonlinux_ppc64le_python3.10.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.11.____cpythonlinux_ppc64le_python3.11.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.12.____cpythonlinux_ppc64le_python3.12.____cpython - variant + variant
linux_ppc64le_numpy2.0python3.9.____cpythonlinux_ppc64le_python3.13.____cp313 - variant + variant
linux_ppc64le_numpy2python3.13.____cp313linux_ppc64le_python3.14.____cp314 - variant + variant
osx_64_numpy2.0python3.10.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy2.0python3.11.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy2.0python3.12.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_64_numpy2.0python3.9.____cpythonosx_64_python3.13.____cp313 - variant + variant
osx_64_numpy2python3.13.____cp313osx_64_python3.14.____cp314 - variant + variant
osx_arm64_numpy2.0python3.10.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy2.0python3.11.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_arm64_numpy2.0python3.12.____cpythonosx_arm64_python3.12.____cpython - variant + variant
osx_arm64_numpy2.0python3.9.____cpythonosx_arm64_python3.13.____cp313 - variant + variant
osx_arm64_numpy2python3.13.____cp313osx_arm64_python3.14.____cp314 - variant + variant
win_64_numpy2.0python3.10.____cpythonwin_64_python3.10.____cpython - variant + variant
win_64_numpy2.0python3.11.____cpythonwin_64_python3.11.____cpython - variant + variant
win_64_numpy2.0python3.12.____cpythonwin_64_python3.12.____cpython - variant + variant
win_64_numpy2.0python3.9.____cpythonwin_64_python3.13.____cp313 - variant + variant
win_64_numpy2python3.13.____cp313win_64_python3.14.____cp314 - variant + variant