Skip to content

Remove gdal and other optional dependency #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xylar merged 6 commits into from
Oct 19, 2020
Merged

Remove gdal and other optional dependency #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57a1dfe
Remove gdal as a dependency
xylar Oct 16, 2020
bb4906b
Add geos as a dependency
xylar Oct 16, 2020
463cb4d
Remove more optional dependencies
xylar Oct 16, 2020
072d36b
MNT: Re-rendered with conda-build 3.20.4, conda-smithy 3.8.2, and con…
Oct 16, 2020
5a9cd30
Add missing dependencies to tests
xylar Oct 16, 2020
07313d6
Add error_overlinking
xylar Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .ci_support/linux_64_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,3 +26,8 @@ python:
- 3.6.* *_cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
11 changes: 7 additions & 4 deletions .ci_support/linux_64_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,3 +26,8 @@ python:
- 3.7.* *_cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
11 changes: 7 additions & 4 deletions .ci_support/linux_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,3 +26,8 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
7 changes: 0 additions & 7 deletions .ci_support/migrations/proj711.yaml
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions .ci_support/osx_64_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,3 +28,8 @@ python:
- 3.6.* *_cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
11 changes: 7 additions & 4 deletions .ci_support/osx_64_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,3 +28,8 @@ python:
- 3.7.* *_cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
11 changes: 7 additions & 4 deletions .ci_support/osx_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,3 +28,8 @@ python:
- 3.8.* *_cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
9 changes: 5 additions & 4 deletions .ci_support/win_64_python3.6.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,3 +22,6 @@ target_platform:
- win-64
vc:
- '14'
zip_keys:
- - python
- numpy
9 changes: 5 additions & 4 deletions .ci_support/win_64_python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,3 +22,6 @@ target_platform:
- win-64
vc:
- '14'
zip_keys:
- - python
- numpy
9 changes: 5 additions & 4 deletions .ci_support/win_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,3 +22,6 @@ target_platform:
- win-64
vc:
- '14'
zip_keys:
- - python
- numpy
2 changes: 1 addition & 1 deletion build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ source:

build:
skip: true # [win and vc<14]
Comment thread
xylar marked this conversation as resolved.
number: 3
error_overlinking: true
number: 4

requirements:
build:
Expand All @@ -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
Expand Down