From dd4b3c25f5de4b37c64970f6a695851e73c37400 Mon Sep 17 00:00:00 2001 From: snowman2 Date: Tue, 19 Sep 2023 20:34:27 -0500 Subject: [PATCH 1/5] DEP: pyproj 3.6.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c8db54c..80db043 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.6.0" %} +{% set version = "3.6.1rc0" %} package: name: pyproj @@ -6,10 +6,10 @@ package: source: url: https://pypi.io/packages/source/p/pyproj/pyproj-{{ version }}.tar.gz - sha256: a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062 + sha256: 1789ed7df0726d94dc61b32b29c4233c81f2967d21982980e836500bbc26dc7d build: - number: 1 + number: 0 # we will figure out the ppc64le failures in a subsequent PR skip: true # [py<39 or ppc64le] entry_points: From ef9cf6670ea874c1d7698028c81c78fec97a2a35 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 01:38:12 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.0, and conda-forge-pinning 2023.09.19.16.03.16 --- .azure-pipelines/azure-pipelines-linux.yml | 29 ++--- .azure-pipelines/azure-pipelines-osx.yml | 20 +-- .azure-pipelines/azure-pipelines-win.yml | 65 +++------- ...x_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 2 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...ch64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 2 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 2 +- .ci_support/migrations/proj920.yaml | 7 -- .ci_support/migrations/proj921.yaml | 7 -- ...x_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 2 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...rm64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...n_64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 2 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 2 +- .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 18 +-- .scripts/run_win_build.bat | 115 ++++++++++++++++++ README.md | 56 ++++----- 24 files changed, 208 insertions(+), 150 deletions(-) rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (97%) delete mode 100644 .ci_support/migrations/proj920.yaml delete mode 100644 .ci_support/migrations/proj921.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (97%) rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6e25045..b080874 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,32 +8,32 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_numpy1.23python3.11.____cpython: @@ -43,11 +43,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 0f75ac3..7785f0e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,23 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.9.____cpython: - CONFIG: osx_arm64_numpy1.21python3.9.____cpython + osx_arm64_numpy1.22python3.9.____cpython: + CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c3cac6e..dd45e0e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython @@ -26,6 +26,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -44,52 +45,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - 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 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 2fc3656..25362a4 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index 6c6b857..7c063b0 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index f49abd7..7285b79 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 6838313..3b2a1b8 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index bd19ee2..76fdeb4 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 23105da..f840a7c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/migrations/proj920.yaml b/.ci_support/migrations/proj920.yaml deleted file mode 100644 index c9fa473..0000000 --- a/.ci_support/migrations/proj920.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1679172534.2766898 -proj: -- 9.2.0 diff --git a/.ci_support/migrations/proj921.yaml b/.ci_support/migrations/proj921.yaml deleted file mode 100644 index 8be9486..0000000 --- a/.ci_support/migrations/proj921.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__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.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index c5a8d47..9d5bbf4 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 2e02121..3468552 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 1a9800c..7899c0e 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 6ce35ce..f494c5b 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 7444e98..fd70ece 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -11,7 +11,7 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 9888b69..28400d7 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index c7eb976..5e63477 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 43ab813..d05d6d2 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -5,7 +5,7 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..322832b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - 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 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..cd9a88f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} 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 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..68f1ef9 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: 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 +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -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 +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 3e0a09c..73f696f 100644 --- a/README.md +++ b/README.md @@ -27,24 +27,24 @@ Current build status - + - + - + @@ -55,24 +55,24 @@ Current build status - + - + - + @@ -83,24 +83,24 @@ Current build status - + - + - + @@ -111,17 +111,17 @@ Current build status - + - + @@ -132,24 +132,24 @@ Current build status - + - + - + From ab5bd494b1d40bf230874374aaf2e69e14ae857b Mon Sep 17 00:00:00 2001 From: snowman2 Date: Tue, 19 Sep 2023 20:59:10 -0500 Subject: [PATCH 3/5] TST: Remove pandas & xarray deps --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 80db043..1d86eb5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,8 +42,6 @@ test: - pytest - shapely - numpy - - pandas - - xarray imports: - pyproj commands: From 2db5de0b0c9ccdb88aa33ecd2d07d3bb3254d504 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Wed, 20 Sep 2023 21:22:24 -0500 Subject: [PATCH 4/5] pyproj 3.6.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d86eb5..3147b3e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.6.1rc0" %} +{% set version = "3.6.1" %} package: name: pyproj @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/p/pyproj/pyproj-{{ version }}.tar.gz - sha256: 1789ed7df0726d94dc61b32b29c4233c81f2967d21982980e836500bbc26dc7d + sha256: 44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf build: number: 0 From 501aeaf203c3f8215d0aecc20a3df580a4ee494e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 02:24:31 +0000 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.1, and conda-forge-pinning 2023.09.20.07.15.04 --- .scripts/run_win_build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 68f1ef9..07d3445 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -60,7 +60,7 @@ if /i "%CI%" == "github_actions" ( set "TEMP=%RUNNER_TEMP%" ) if /i "%CI%" == "azure" ( - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" if /i "%BUILD_REASON%" == "PullRequest" ( set "IS_PR_BUILD=True"
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.9.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonwin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant