diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f15ac40..9294aa1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,52 +8,40 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_numpy1.26python3.12.____cpython: - CONFIG: linux_64_numpy1.26python3.12.____cpython + linux_64_python3.13.____cp313: + CONFIG: linux_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_numpy2python3.13.____cp313: - CONFIG: linux_64_numpy2python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_numpy1.22python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 - linux_aarch64_numpy1.26python3.12.____cpython: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 - linux_aarch64_numpy2python3.13.____cp313: - CONFIG: linux_aarch64_numpy2python3.13.____cp313 + linux_aarch64_python3.13.____cp313: + CONFIG: linux_aarch64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9 - linux_ppc64le_numpy1.22python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le:alma9 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_python3.11.____cpython: + CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le:alma9 - linux_ppc64le_numpy1.26python3.12.____cpython: - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le:alma9 - linux_ppc64le_numpy2python3.13.____cp313: - CONFIG: linux_ppc64le_numpy2python3.13.____cp313 + linux_ppc64le_python3.13.____cp313: + CONFIG: linux_ppc64le_python3.13.____cp313 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le:alma9 timeoutInMinutes: 360 @@ -85,4 +73,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 36ba16f..a6fa459 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,23 @@ jobs: vmImage: macOS-13 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____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_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2python3.13.____cp313: - CONFIG: osx_arm64_numpy2python3.13.____cp313 + osx_arm64_python3.13.____cp313: + CONFIG: osx_arm64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} @@ -55,4 +49,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 6302076..0be2709 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____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 + win_64_python3.13.____cp313: + CONFIG: win_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -44,4 +41,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_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index 73d1642..0000000 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -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 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index 21c6dda..04d1f41 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.11.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 95ca678..a977f82 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.12.* *_cpython target_platform: - linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml similarity index 90% rename from .ci_support/linux_64_numpy2python3.13.____cp313.yaml rename to .ci_support/linux_64_python3.13.____cp313.yaml index afa75f0..b1a9ffa 100644 --- a/.ci_support/linux_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -26,6 +26,3 @@ python: - 3.13.* *_cp313 target_platform: - linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index c2e1107..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -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-aarch64:alma9 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml index 6473d08..ff8f19d 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma9 numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index 386a764..adcb3d6 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma9 numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.12.* *_cpython target_platform: - linux-aarch64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml similarity index 90% rename from .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml rename to .ci_support/linux_aarch64_python3.13.____cp313.yaml index 9756966..3f0b4ea 100644 --- a/.ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -26,6 +26,3 @@ python: - 3.13.* *_cp313 target_platform: - linux-aarch64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index 8f6c36e..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -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-ppc64le:alma9 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpython.yaml index 3e2cb8a..417bf57 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-ppc64le:alma9 numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_python3.12.____cpython.yaml index 8a9e4ba..ae5dc52 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-ppc64le:alma9 numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -26,6 +26,3 @@ python: - 3.12.* *_cpython target_platform: - linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml similarity index 90% rename from .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml rename to .ci_support/linux_ppc64le_python3.13.____cp313.yaml index 9c61d7e..dd9923c 100644 --- a/.ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '13' +- '14' c_stdlib: - sysroot c_stdlib_version: @@ -26,6 +26,3 @@ python: - 3.13.* *_cp313 target_platform: - linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index 3c3d68d..0000000 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 55aae75..7dea66e 100644 --- a/.ci_support/osx_64_numpy1.23python3.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: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -28,6 +28,3 @@ python: - 3.11.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index cec42bf..9f585bf 100644 --- a/.ci_support/osx_64_numpy1.26python3.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: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -28,6 +28,3 @@ python: - 3.12.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml similarity index 91% rename from .ci_support/osx_64_numpy2python3.13.____cp313.yaml rename to .ci_support/osx_64_python3.13.____cp313.yaml index b5e443b..f28c4cc 100644 --- a/.ci_support/osx_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,6 +28,3 @@ python: - 3.13.* *_cp313 target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index eb9f0cf..0000000 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index b0b902a..7ae7280 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.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: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -28,6 +28,3 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index 749cb17..a220189 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.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: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -28,6 +28,3 @@ python: - 3.12.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml rename to .ci_support/osx_arm64_python3.13.____cp313.yaml index 3026cc7..8d38667 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '19' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -28,6 +28,3 @@ python: - 3.13.* *_cp313 target_platform: - osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index cf4cb0e..0000000 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,23 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.6' -python: -- 3.10.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml index 2db6141..f4892d2 100644 --- a/.ci_support/win_64_numpy1.23python3.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: @@ -7,7 +7,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.23' +- '2' pin_run_as_build: python: min_pin: x.x @@ -18,6 +18,3 @@ python: - 3.11.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 82% rename from .ci_support/win_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index d4be1ca..eccfda8 100644 --- a/.ci_support/win_64_numpy1.26python3.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: @@ -7,7 +7,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.26' +- '2' pin_run_as_build: python: min_pin: x.x @@ -18,6 +18,3 @@ python: - 3.12.* *_cpython target_platform: - win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy2python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml similarity index 85% rename from .ci_support/win_64_numpy2python3.13.____cp313.yaml rename to .ci_support/win_64_python3.13.____cp313.yaml index d733b28..4e4a349 100644 --- a/.ci_support/win_64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -18,6 +18,3 @@ python: - 3.13.* *_cp313 target_platform: - win-64 -zip_keys: -- - python - - numpy 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/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29f..780a358 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -97,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 0e3c394..361edeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -117,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 283e143..27c552b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -25,7 +25,7 @@ set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" echo Downloading micromamba %MICROMAMBA_VERSION% if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +powershell -ExecutionPolicy Bypass -Command "(New-Object Net.WebClient).DownloadFile('%MICROMAMBA_URL%', '%MICROMAMBA_EXE%')" if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment @@ -148,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 06742ea..a5d8c30 100644 --- a/README.md +++ b/README.md @@ -27,171 +27,129 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - diff --git a/build-locally.py b/build-locally.py index c4a56c6..9dfe440 100755 --- a/build-locally.py +++ b/build-locally.py @@ -10,6 +10,7 @@ import os import platform import subprocess +import sys from argparse import ArgumentParser @@ -44,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") @@ -60,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) @@ -104,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/meta.yaml b/recipe/meta.yaml index 7e3788f..c57cf9d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.7.1" %} +{% set version = "3.7.2" %} package: name: pyproj @@ -6,11 +6,11 @@ package: source: url: https://pypi.org/packages/source/p/pyproj/pyproj-{{ version }}.tar.gz - sha256: 60d72facd7b6b79853f19744779abcd3f804c4e0d4fa8815469db20c9f640a47 + sha256: 39a0cf1ecc7e282d1d30f36594ebd55c9fae1fda8a2622cee5d100430628f88c build: - number: 1 - skip: true # [py<310] + number: 0 + skip: true # [py<311] entry_points: - pyproj=pyproj.__main__:main
VariantStatus
linux_64_numpy1.22python3.10.____cpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_python3.12.____cpython - variant + variant
linux_64_numpy1.26python3.12.____cpythonlinux_64_python3.13.____cp313 - variant + variant
linux_64_numpy2python3.13.____cp313linux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_numpy1.22python3.10.____cpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_python3.13.____cp313 - variant + variant
linux_aarch64_numpy1.26python3.12.____cpythonlinux_ppc64le_python3.11.____cpython - variant + variant
linux_aarch64_numpy2python3.13.____cp313linux_ppc64le_python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.22python3.10.____cpythonlinux_ppc64le_python3.13.____cp313 - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonosx_64_python3.11.____cpython - variant + variant
linux_ppc64le_numpy1.26python3.12.____cpythonosx_64_python3.12.____cpython - variant + variant
linux_ppc64le_numpy2python3.13.____cp313osx_64_python3.13.____cp313 - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_arm64_python3.12.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_arm64_python3.13.____cp313 - variant + variant
osx_64_numpy2python3.13.____cp313win_64_python3.11.____cpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonwin_64_python3.12.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonwin_64_python3.13.____cp313 - variant - -
osx_arm64_numpy1.26python3.12.____cpython - - variant - -
osx_arm64_numpy2python3.13.____cp313 - - variant - -
win_64_numpy1.22python3.10.____cpython - - variant - -
win_64_numpy1.23python3.11.____cpython - - variant - -
win_64_numpy1.26python3.12.____cpython - - variant - -
win_64_numpy2python3.13.____cp313 - - variant + variant