From 51471a94c14fffe78b00b69dafa79b3849a89f70 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Sat, 25 Mar 2023 08:29:11 -0500 Subject: [PATCH 1/3] pyproj 3.5.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fafb608..9399b4c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.4.1" %} +{% set version = "3.5.0rc0" %} package: name: pyproj @@ -6,13 +6,13 @@ package: source: url: https://pypi.io/packages/source/p/pyproj/pyproj-{{ version }}.tar.gz - sha256: 261eb29b1d55b1eb7f336127344d9b31284d950a9446d1e0d1c2411f7dd8e3ac + sha256: 8d0b0f7751b5625fd96354335b3427db1817cad99148017a9afce3742b7f5f28 patches: # remove on next release, see https://github.com/pyproj4/pyproj/pull/1210 - 0001-fix-expected-transform-grid-list.patch build: - number: 1 + number: 0 skip: true # [py<38] entry_points: - pyproj=pyproj.__main__:main From dbd5fcb32f8b44d57f9d5b28c8b8d8c77a254185 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:31:35 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.25.05.04.42 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 944ccee..8d8a5ff 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_numpy1.20python3.8.____73_pypy: @@ -51,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 12e958a..081c7c6 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About pyproj -============ +About pyproj-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/pyproj-feedstock/blob/main/LICENSE.txt) Home: https://github.com/pyproj4/pyproj Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/pyproj-feedstock/blob/main/LICENSE.txt) - Summary: Python interface to PROJ library Current build status From 83584f3525ec7c4b9f6915275b8c0fdabcb54b67 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Sat, 25 Mar 2023 22:24:42 -0500 Subject: [PATCH 3/3] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9399b4c..bd2f7a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,11 +1,11 @@ -{% set version = "3.5.0rc0" %} +{% set version = "3.5.0" %} package: name: pyproj version: {{ version }} source: - url: https://pypi.io/packages/source/p/pyproj/pyproj-{{ version }}.tar.gz + url: https://pypi.io/packages/source/p/pyproj/pyproj-3.5.0rc0.tar.gz sha256: 8d0b0f7751b5625fd96354335b3427db1817cad99148017a9afce3742b7f5f28 patches: # remove on next release, see https://github.com/pyproj4/pyproj/pull/1210