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 95% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 2fc3656..f0cb0ed 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -11,13 +11,13 @@ 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 max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____73_pypy.yaml similarity index 95% 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..aba5aa8 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -11,13 +11,13 @@ 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 max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index f49abd7..e9e3412 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -11,13 +11,13 @@ 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 max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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 4d67a54..d364202 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.1 +- 9.3.0 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 6838313..46c14de 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -15,13 +15,13 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____73_pypy.yaml similarity index 95% 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..698e172 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -15,13 +15,13 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 23105da..a7a0e2d 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -15,13 +15,13 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-aarch64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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 8fd950b..f523e66 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.1 +- 9.3.0 python: - 3.11.* *_cpython target_platform: 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/migrations/proj920.yaml b/.ci_support/migrations/proj930.yaml similarity index 64% rename from .ci_support/migrations/proj920.yaml rename to .ci_support/migrations/proj930.yaml index c9fa473..524717f 100644 --- a/.ci_support/migrations/proj920.yaml +++ b/.ci_support/migrations/proj930.yaml @@ -2,6 +2,6 @@ __migrator: build_number: 1 kind: version migration_number: 1 -migrator_ts: 1679172534.2766898 +migrator_ts: 1693581350.7818532 proj: -- 9.2.0 +- 9.3.0 diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index c5a8d47..2d26441 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____73_pypy.yaml similarity index 95% 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..932325a 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -11,13 +11,13 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 1a9800c..4d20718 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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 094bb79..49683a9 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.1 +- 9.3.0 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 6ce35ce..9e9065d 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 python: - 3.10.* *_cpython target_platform: diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 7444e98..162fe45 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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 272649d..240269a 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.1 +- 9.3.0 python: - 3.11.* *_cpython target_platform: diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 9888b69..c0985b5 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -5,13 +5,13 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____73_pypy.yaml similarity index 93% 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..6dba8eb 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -5,13 +5,13 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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.22python3.9.____cpython.yaml similarity index 93% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 43ab813..7a0ccac 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -5,13 +5,13 @@ channel_sources: channel_targets: - conda-forge main numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x max_pin: x.x proj: -- 9.2.1 +- 9.3.0 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 f5396bd..034e086 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.1 +- 9.3.0 python: - 3.11.* *_cpython target_platform: 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 - + - + - + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c8db54c..1d86eb5 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: @@ -42,8 +42,6 @@ test: - pytest - shapely - numpy - - pandas - - xarray imports: - pyproj commands:
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