diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d1d9d99..904d253 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,72 +8,48 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____73_pypy: - CONFIG: linux_64_numpy1.20python3.8.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____73_pypy: - CONFIG: linux_64_numpy1.20python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.21python3.10.____cpython: CONFIG: linux_64_numpy1.21python3.10.____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.20python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.20python3.8.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.20python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.20python3.8.____cpython + linux_64_numpy1.21python3.9.____73_pypy: + CONFIG: linux_64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.20python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.20python3.9.____73_pypy + linux_64_numpy1.21python3.9.____cpython: + CONFIG: linux_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.20python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.20python3.9.____cpython + 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 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_numpy1.21python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.20python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.20python3.8.____73_pypy + linux_aarch64_numpy1.21python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.20python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.8.____cpython + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.20python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.20python3.9.____73_pypy + linux_ppc64le_numpy1.21python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.20python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.9.____cpython + 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-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_ppc64le_numpy1.21python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpython: @@ -83,11 +59,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 982b2d0..0f75ac3 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,33 +8,24 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____73_pypy: - CONFIG: osx_64_numpy1.20python3.8.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____73_pypy: - CONFIG: osx_64_numpy1.20python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.21python3.10.____cpython: CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy1.21python3.9.____73_pypy: + CONFIG: osx_64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.8.____cpython: - CONFIG: osx_arm64_numpy1.20python3.8.____cpython + osx_64_numpy1.21python3.9.____cpython: + CONFIG: osx_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.9.____cpython: - CONFIG: osx_arm64_numpy1.20python3.9.____cpython + 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 UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.21python3.9.____cpython: + CONFIG: osx_arm64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8d8a5ff..9f4fd4e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,21 +8,15 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.20python3.8.____73_pypy: - CONFIG: win_64_numpy1.20python3.8.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.8.____cpython: - CONFIG: win_64_numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____73_pypy: - CONFIG: win_64_numpy1.20python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____cpython: - CONFIG: win_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.21python3.10.____cpython: CONFIG: win_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.21python3.9.____73_pypy: + CONFIG: win_64_numpy1.21python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' + win_64_numpy1.21python3.9.____cpython: + CONFIG: win_64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' @@ -75,7 +69,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index bb1e759..0000000 --- a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 6bf2417..0000000 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 1f691fa..05e63dd 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml index a95ebbc..5f5e013 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml index 867cdc3..c990e47 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 4f28ad0..7fde495 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index c94c44e..0000000 --- a/.ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 93f1a15..0000000 --- a/.ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index 9ae393a..77204a6 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,11 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml index 90c21fb..b42db6c 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml index 5225920..f89a58a 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 8fabb24..4424de0 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,11 +15,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index 9ba3169..0000000 --- a/.ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 64cc8df..0000000 --- a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '11' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml index 3a530b0..9e463cd 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,11 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml index 18fc225..f4f6079 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml similarity index 91% rename from .ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml index 0244816..3302ec9 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 3ed04f0..7a59aac 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,11 +11,9 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 -geos: -- 3.11.2 numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/migrations/geos3112.yaml b/.ci_support/migrations/geos3112.yaml deleted file mode 100644 index 9680f62..0000000 --- a/.ci_support/migrations/geos3112.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -geos: -- 3.11.2 -migrator_ts: 1679057210.3134933 diff --git a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index 23a1a59..0000000 --- a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -geos: -- 3.11.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index fc66fe3..0000000 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -geos: -- 3.11.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 71d23ca..8ae3017 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml index 70abe28..52483a9 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml similarity index 91% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml index d4760e8..8095879 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 2fdf713..c847d53 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index d8fa5e8..0000000 --- a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -geos: -- 3.11.2 -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml index c25310f..4116953 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml similarity index 91% rename from .ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml index 49ea4aa..0da5acf 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,13 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index d986662..9e28a72 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' -geos: -- 3.11.2 +- '15' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index 3bcc516..0000000 --- a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,23 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml deleted file mode 100644 index 12ebfaa..0000000 --- a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml +++ /dev/null @@ -1,23 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -geos: -- 3.11.2 -numpy: -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml index 9491936..b5a0e6a 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -6,8 +6,6 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 -geos: -- 3.11.2 numpy: - '1.21' pin_run_as_build: diff --git a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml similarity index 91% rename from .ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml index 54eb62a..35b275f 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml @@ -6,10 +6,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml similarity index 91% rename from .ci_support/win_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.9.____cpython.yaml index ec9d649..5451318 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml @@ -6,10 +6,8 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 -geos: -- 3.11.2 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 2172852..ac9d153 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -6,8 +6,6 @@ channel_targets: - conda-forge main cxx_compiler: - vs2019 -geos: -- 3.11.2 numpy: - '1.23' pin_run_as_build: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -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/README.md b/README.md index ad63d18..5b9b9f4 100644 --- a/README.md +++ b/README.md @@ -31,34 +31,6 @@ Current build status
| Variant | Status | |
|---|---|---|
| linux_64_numpy1.20python3.8.____73_pypy | -
-
- |
- |
| linux_64_numpy1.20python3.8.____cpython | -
-
- |
- |
| linux_64_numpy1.20python3.9.____73_pypy | -
-
- |
- |
| linux_64_numpy1.20python3.9.____cpython | -
-
- |
- |
| linux_64_numpy1.21python3.10.____cpython | @@ -66,38 +38,24 @@ Current build status | |
| linux_64_numpy1.23python3.11.____cpython | -
-
- |
- |
| linux_aarch64_numpy1.20python3.8.____73_pypy | -
-
- |
- |
| linux_aarch64_numpy1.20python3.8.____cpython | +linux_64_numpy1.21python3.9.____73_pypy |
- |
| linux_aarch64_numpy1.20python3.9.____73_pypy | +linux_64_numpy1.21python3.9.____cpython |
- |
| linux_aarch64_numpy1.20python3.9.____cpython | +linux_64_numpy1.23python3.11.____cpython |
- |
| linux_aarch64_numpy1.23python3.11.____cpython | +linux_aarch64_numpy1.21python3.9.____73_pypy |
- |
| linux_ppc64le_numpy1.20python3.8.____73_pypy | +linux_aarch64_numpy1.21python3.9.____cpython |
- |
| linux_ppc64le_numpy1.20python3.8.____cpython | -
-
- |
- |
| linux_ppc64le_numpy1.20python3.9.____73_pypy | -
-
- |
- |
| linux_ppc64le_numpy1.20python3.9.____cpython | +linux_aarch64_numpy1.23python3.11.____cpython |
- |
| linux_ppc64le_numpy1.23python3.11.____cpython | -
-
- |
- |
| osx_64_numpy1.20python3.8.____73_pypy | -
-
- |
- |
| osx_64_numpy1.20python3.8.____cpython | +linux_ppc64le_numpy1.21python3.9.____73_pypy |
- |
| osx_64_numpy1.20python3.9.____73_pypy | +linux_ppc64le_numpy1.21python3.9.____cpython |
- |
| osx_64_numpy1.20python3.9.____cpython | +linux_ppc64le_numpy1.23python3.11.____cpython |
- |
| osx_64_numpy1.23python3.11.____cpython | +osx_64_numpy1.21python3.9.____73_pypy |
- |
| osx_arm64_numpy1.20python3.8.____cpython | +osx_64_numpy1.21python3.9.____cpython |
- |
| osx_arm64_numpy1.20python3.9.____cpython | +osx_64_numpy1.23python3.11.____cpython |
- |
| osx_arm64_numpy1.23python3.11.____cpython | +osx_arm64_numpy1.21python3.9.____cpython |
- |
| win_64_numpy1.20python3.8.____73_pypy | -
-
- |
- |
| win_64_numpy1.20python3.8.____cpython | +osx_arm64_numpy1.23python3.11.____cpython |
- |
| win_64_numpy1.20python3.9.____73_pypy | +win_64_numpy1.21python3.10.____cpython |
- |
| win_64_numpy1.20python3.9.____cpython | +win_64_numpy1.21python3.9.____73_pypy |
- |
| win_64_numpy1.21python3.10.____cpython | +win_64_numpy1.21python3.9.____cpython |
- |