diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a14e5aa..cac286b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,7 +20,6 @@ jobs: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: condaforge/linux-anvil-comp7 - maxParallel: 8 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7fc4fc6..3b6ec89 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,7 +17,6 @@ jobs: osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 8 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a4edbe6..1244454 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,7 +17,6 @@ jobs: win_64_python3.8.____cpython: CONFIG: win_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - maxParallel: 4 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_python3.6.____cpython.yaml b/.ci_support/linux_64_python3.6.____cpython.yaml index da0b64c..9a8afa1 100644 --- a/.ci_support/linux_64_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_python3.6.____cpython.yaml @@ -12,13 +12,11 @@ cxx_compiler_version: - '7' docker_image: - condaforge/linux-anvil-comp7 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -28,3 +26,8 @@ python: - 3.6.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml index db83d29..bd090ca 100644 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_python3.7.____cpython.yaml @@ -12,13 +12,11 @@ cxx_compiler_version: - '7' docker_image: - condaforge/linux-anvil-comp7 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -28,3 +26,8 @@ python: - 3.7.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 4880160..7005312 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -12,13 +12,11 @@ cxx_compiler_version: - '7' docker_image: - condaforge/linux-anvil-comp7 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -28,3 +26,8 @@ python: - 3.8.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/migrations/proj711.yaml b/.ci_support/migrations/proj711.yaml deleted file mode 100644 index aeb974f..0000000 --- a/.ci_support/migrations/proj711.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -proj: -- '7.1.1' -migrator_ts: 1599583732 diff --git a/.ci_support/osx_64_python3.6.____cpython.yaml b/.ci_support/osx_64_python3.6.____cpython.yaml index e7fc399..435c43d 100644 --- a/.ci_support/osx_64_python3.6.____cpython.yaml +++ b/.ci_support/osx_64_python3.6.____cpython.yaml @@ -12,15 +12,13 @@ cxx_compiler: - clangxx cxx_compiler_version: - '10' -gdal: -- '3.1' +geos: +- 3.8.1 macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -30,3 +28,8 @@ python: - 3.6.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml index d8fc9c6..1b2183a 100644 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_python3.7.____cpython.yaml @@ -12,15 +12,13 @@ cxx_compiler: - clangxx cxx_compiler_version: - '10' -gdal: -- '3.1' +geos: +- 3.8.1 macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -30,3 +28,8 @@ python: - 3.7.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index debdddd..e2bf440 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -12,15 +12,13 @@ cxx_compiler: - clangxx cxx_compiler_version: - '10' -gdal: -- '3.1' +geos: +- 3.8.1 macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -30,3 +28,8 @@ python: - 3.8.* *_cpython target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_64_python3.6.____cpython.yaml b/.ci_support/win_64_python3.6.____cpython.yaml index d1d9c91..8031cc3 100644 --- a/.ci_support/win_64_python3.6.____cpython.yaml +++ b/.ci_support/win_64_python3.6.____cpython.yaml @@ -6,13 +6,11 @@ channel_targets: - conda-forge main cxx_compiler: - vs2017 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -24,3 +22,6 @@ target_platform: - win-64 vc: - '14' +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpython.yaml index 3ecb035..522ef19 100644 --- a/.ci_support/win_64_python3.7.____cpython.yaml +++ b/.ci_support/win_64_python3.7.____cpython.yaml @@ -6,13 +6,11 @@ channel_targets: - conda-forge main cxx_compiler: - vs2017 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -24,3 +22,6 @@ target_platform: - win-64 vc: - '14' +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index 49aef4f..55fc7fb 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -6,13 +6,11 @@ channel_targets: - conda-forge main cxx_compiler: - vs2017 -gdal: -- '3.1' +geos: +- 3.8.1 numpy: - '1.16' pin_run_as_build: - gdal: - max_pin: x.x python: min_pin: x.x max_pin: x.x @@ -24,3 +22,6 @@ target_platform: - win-64 vc: - '14' +zip_keys: +- - python + - numpy diff --git a/build-locally.py b/build-locally.py index d92f4ed..3453cfe 100755 --- a/build-locally.py +++ b/build-locally.py @@ -61,7 +61,7 @@ def main(args=None): help="Setup debug environment using `conda debug`", ) p.add_argument( - "--output-id", help="If running debug, specifiy the output to setup." + "--output-id", help="If running debug, specify the output to setup." ) ns = p.parse_args(args=args) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 772eabe..001be8d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,8 @@ source: build: skip: true # [win and vc<14] - number: 3 + error_overlinking: true + number: 4 requirements: build: @@ -22,22 +23,25 @@ requirements: - cython - numpy - msinttypes # [win and vc<14] + # proj and geos are needed as dependencies even though not listed upstream - proj - - gdal + - geos run: - python - {{ pin_compatible('numpy') }} - - pillow >=1.7.8 - - owslib >=0.8.11 - shapely >=1.5.6 - - scipy >=0.10 - pyshp >=1.1.4 - - matplotlib-base >=1.5.1 - - pyepsg >=0.4.0 + - six >=1.3.0 + # proj and geos are needed as dependencies even though not listed upstream - proj - - gdal + - geos test: + requires: + - matplotlib-base >=1.5.1 + - gdal >=1.10.0 + - pillow >=1.7.8 + - scipy >=0.10 imports: - cartopy - cartopy.mpl.geoaxes