From 0a969f5d562bc39c0e00c40d39c6cba74b388411 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:32:05 -0500 Subject: [PATCH] Rebuild for proj921 (#136) * Skip ppc64le builds for now --------- Co-authored-by: Xylar Asay-Davis Co-authored-by: Alan D. Snow Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com> --- .azure-pipelines/azure-pipelines-linux.yml | 16 ----------- ...ux_64_numpy1.21python3.10.____cpython.yaml | 2 +- ...nux_64_numpy1.21python3.9.____73_pypy.yaml | 2 +- ...nux_64_numpy1.21python3.9.____cpython.yaml | 2 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.21python3.10.____cpython.yaml | 2 +- ...arch64_numpy1.21python3.9.____73_pypy.yaml | 2 +- ...arch64_numpy1.21python3.9.____cpython.yaml | 2 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.21python3.10.____cpython.yaml | 27 ------------------ ...pc64le_numpy1.21python3.9.____73_pypy.yaml | 27 ------------------ ...pc64le_numpy1.21python3.9.____cpython.yaml | 27 ------------------ ...c64le_numpy1.23python3.11.____cpython.yaml | 27 ------------------ .ci_support/migrations/proj921.yaml | 7 +++++ ...sx_64_numpy1.21python3.10.____cpython.yaml | 2 +- ...osx_64_numpy1.21python3.9.____73_pypy.yaml | 2 +- ...osx_64_numpy1.21python3.9.____cpython.yaml | 2 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...arm64_numpy1.21python3.10.____cpython.yaml | 2 +- ..._arm64_numpy1.21python3.9.____cpython.yaml | 2 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 2 +- ...in_64_numpy1.21python3.10.____cpython.yaml | 2 +- ...win_64_numpy1.21python3.9.____73_pypy.yaml | 2 +- ...win_64_numpy1.21python3.9.____cpython.yaml | 2 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- README.md | 28 ------------------- recipe/meta.yaml | 7 +++-- 27 files changed, 30 insertions(+), 174 deletions(-) delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml create mode 100644 .ci_support/migrations/proj921.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c02766e..6e25045 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -40,22 +40,6 @@ jobs: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index b4d3661..2fc3656 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml index fb50294..6c6b857 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_73_pypy target_platform: diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml index c09951b..f49abd7 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 92bd454..4d67a54 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index d85e3cd..6838313 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml index 6546eaa..bd19ee2 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_73_pypy target_platform: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml index 0f1ab7e..23105da 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 5b3a930..8fd950b 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml deleted file mode 100644 index 19843ef..0000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 9.2.0 -python: -- 3.10.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml deleted file mode 100644 index 7e3d546..0000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 9.2.0 -python: -- 3.9.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml deleted file mode 100644 index 8ebc290..0000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 9.2.0 -python: -- 3.9.* *_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_numpy1.23python3.11.____cpython.yaml deleted file mode 100644 index 4b030eb..0000000 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -numpy: -- '1.23' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- 9.2.0 -python: -- 3.11.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/migrations/proj921.yaml b/.ci_support/migrations/proj921.yaml new file mode 100644 index 0000000..8be9486 --- /dev/null +++ b/.ci_support/migrations/proj921.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1685643692.15039 +proj: +- 9.2.1 diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 55385e1..c5a8d47 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml index 81d05c8..2e02121 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_73_pypy target_platform: diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml index f1f5ee2..1a9800c 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 9c392ed..094bb79 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml index 3b31af3..6ce35ce 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml index 5ecdae0..7444e98 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 3789a43..272649d 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml index 10453cc..9888b69 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml index 763c45e..c7eb976 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_73_pypy target_platform: diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml index 34514ac..43ab813 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.9.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index e860006..f5396bd 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x proj: -- 9.2.0 +- 9.2.1 python: - 3.11.* *_cpython target_platform: diff --git a/README.md b/README.md index 4ddc1af..3e0a09c 100644 --- a/README.md +++ b/README.md @@ -82,34 +82,6 @@ Current build status variant - - linux_ppc64le_numpy1.21python3.10.____cpython - - - variant - - - - linux_ppc64le_numpy1.21python3.9.____73_pypy - - - variant - - - - linux_ppc64le_numpy1.21python3.9.____cpython - - - variant - - - - linux_ppc64le_numpy1.23python3.11.____cpython - - - variant - - osx_64_numpy1.21python3.10.____cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f35f25..c8db54c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,9 @@ source: sha256: a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062 build: - number: 0 - skip: true # [py<39] + number: 1 + # we will figure out the ppc64le failures in a subsequent PR + skip: true # [py<39 or ppc64le] entry_points: - pyproj=pyproj.__main__:main script_env: @@ -51,7 +52,7 @@ test: - export "PYPROJ_GLOBAL_CONTEXT=ON" # [unix] - set "PROJ_NETWORK=ON" # [win] - set "PYPROJ_GLOBAL_CONTEXT=ON" # [win] - - pytest -v -s + - python -m pytest -v -s about: home: https://github.com/pyproj4/pyproj license: MIT