forked from conda-forge/basemap-feedstock
-
Notifications
You must be signed in to change notification settings - Fork 0
Update basemap to v1.3.1
#4
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.
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
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
4a636cb
Changes:
a83aba5
remove proj from dependencies
6ba1f4b
typo correction
1691637
skip win32, missing depends
16391b0
cleanup
d58f529
pin update
b932e8c
pin update
886f50a
pin update
bc54754
pin update
b2441d0
pin update
87eb35e
pin update
bbb3542
correct selector for ppc64le
b90f068
Post-review changes.
31b7ea7
correct pinning for pyproj and pyshp
7c41059
http --> https
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| ECHO "====================================================================================================" | ||
| ECHO "Building %PKG_NAME%" | ||
| ECHO "" | ||
|
|
||
| :: Ensure our geos will be used. | ||
| set GEOS_DIR=%LIBRARY_PREFIX% | ||
|
|
||
| :: Jump to the correct build section | ||
| if "%PKG_NAME%"=="basemap" GOTO CASE_basemap | ||
| if "%PKG_NAME%"=="basemap-data" GOTO CASE_basemap_data | ||
| if "%PKG_NAME%"=="basemap-data-hires" GOTO CASE_basemap_data_hires | ||
|
|
||
| ECHO "Unknown package: %PKG_NAME%" | ||
| EXIT 1 | ||
|
|
||
|
|
||
| :CASE_basemap | ||
| "%PYTHON%" -m pip install packages\basemap --no-deps --ignore-installed -vvv | ||
| IF errorlevel 1 EXIT 1 | ||
| GOTO CASE_end | ||
|
|
||
| :CASE_basemap_data | ||
| "%PYTHON%" -m pip install packages\basemap_data --no-deps --ignore-installed -vvv | ||
| IF errorlevel 1 EXIT 1 | ||
| GOTO CASE_end | ||
|
|
||
| :CASE_basemap_data_hires | ||
| "%PYTHON%" -m pip install packages\basemap_data_hires --no-deps --ignore-installed -vvv | ||
| IF errorlevel 1 EXIT 1 | ||
| GOTO CASE_end | ||
|
|
||
|
|
||
| :CASE_END |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/bash | ||
|
|
||
| echo "====================================================================================================" | ||
| echo "Building $PKG_NAME" | ||
| echo "" | ||
|
|
||
| export GEOS_DIR=$PREFIX | ||
|
|
||
| case $PKG_NAME in | ||
|
|
||
| basemap) | ||
| $PYTHON -m pip install packages/basemap --no-deps --ignore-installed -vvv | ||
| ;; | ||
|
|
||
| basemap-data) | ||
| $PYTHON -m pip install packages/basemap_data --no-deps --ignore-installed -vvv | ||
| ;; | ||
|
|
||
| basemap-data-hires) | ||
| $PYTHON -m pip install packages/basemap_data_hires --no-deps --ignore-installed -vvv | ||
| ;; | ||
|
|
||
| *) | ||
| echo "No build instructions for $PKG_NAME" | ||
| exit 1 | ||
| ;; | ||
|
|
||
| esac |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff -ru basemap-1.3.1.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py basemap-1.3.1/packages/basemap/src/mpl_toolkits/basemap/__init__.py | ||
| --- basemap-1.3.1.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2022-01-31 12:16:48.000000000 -0700 | ||
| +++ basemap-1.3.1/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2022-02-08 11:22:55.000000000 -0700 | ||
| @@ -1226,7 +1226,8 @@ | ||
| Unable to open boundary dataset file. Only the 'crude', 'low' and | ||
| 'intermediate' resolution datasets are installed by default. If you | ||
| are requesting a 'high' or 'full' resolution dataset, you need to | ||
| - install the `basemap-data-hires` package.""") | ||
| + install the `basemap-data-hires` package with | ||
| + `conda install -c conda-forge basemap-data-hires`.""") | ||
| # only gshhs coastlines can be polygons. | ||
| if name != 'gshhs': as_polygons=False | ||
| try: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,131 @@ | ||
| {% set version = "1.2.2" %} | ||
| {% set version = "1.3.1" %} | ||
| {% set build_number = "0" %} | ||
|
|
||
| package: | ||
| name: basemap | ||
| name: basemap-split | ||
| version: {{ version }} | ||
|
|
||
| source: | ||
| url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz | ||
| sha256: 7e6ee5d03b10168862cff82bfa819df8264c04f078eac4549a22dd2631696613 | ||
| url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz | ||
| sha256: 8f4ed7d5736711ba2b413e5fe038d4349d35eb3f28cba836094b6cca5f0a634f | ||
| patches: | ||
| - data.patch | ||
| # Update messages regarding installation of `basemap-data-hires`. | ||
| - install_hires_instructions.patch | ||
|
|
||
| build: | ||
| number: 2 | ||
| # This package isn't included to the SOW Packages list | ||
| skip: True # [linux and s390x] | ||
| skip: True # [win and py2k] | ||
| ignore_run_exports: | ||
| - proj | ||
| number: {{ build_number }} | ||
| skip: True # [s390x] Missing dependencies. | ||
| skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. | ||
| skip: True # [py<38] Dependencies require 3.8+ | ||
|
|
||
| requirements: | ||
| build: | ||
| - {{ compiler('c') }} | ||
| - {{ compiler('cxx') }} | ||
| - m2-patch # [win] | ||
| - patch # [not win] | ||
| host: | ||
| - python | ||
| - cython | ||
| - geos | ||
| - numpy | ||
| - pip | ||
| - proj | ||
| - pyproj | ||
| - setuptools | ||
| - wheel | ||
| run: | ||
| - python | ||
| - {{ pin_compatible('numpy') }} | ||
| - geos | ||
| - matplotlib-base >=1.0.0,!=3.0.1 | ||
| - proj | ||
| - pyproj >=1.9.3 | ||
| - pyshp >=1.2.0 | ||
| - six | ||
|
|
||
| test: | ||
| imports: | ||
| - mpl_toolkits.basemap | ||
| requires: | ||
| - pip | ||
| commands: | ||
| - pip check | ||
| - python -c "from mpl_toolkits.basemap import Basemap" | ||
|
|
||
| about: | ||
| home: http://matplotlib.org/basemap | ||
| license: MIT | ||
| license_family: MIT | ||
| license_file: README.md | ||
| summary: 'Plot on map projections using matplotlib' | ||
| description: | | ||
| Basemap toolkit is a library for plotting 2D data on maps in Python. | ||
| It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. | ||
| dev_url: https://github.com/matplotlib/basemap | ||
| doc_url: http://matplotlib.org/basemap/ | ||
| doc_source_url: https://github.com/matplotlib/basemap/blob/master/doc/index.rst | ||
| outputs: | ||
|
|
||
| - name: basemap | ||
| script: build-basemap.sh # [not win] | ||
| script: bld-basemap.bat # [win] | ||
| build: | ||
| requirements: | ||
| build: | ||
| - {{ compiler('c') }} | ||
| - {{ compiler('cxx') }} | ||
| host: | ||
| - python | ||
| - pip | ||
| - cython >=0.29,<3.1 | ||
| - numpy >=1.21 # [not ppc64le] | ||
| - numpy >=1.19 # [ppc64le] | ||
| - geos | ||
| - pyproj | ||
| - setuptools | ||
| - wheel | ||
| run: | ||
| - {{ pin_subpackage('basemap-data') }} | ||
| - python | ||
| - {{ pin_compatible('numpy') }} | ||
| - {{ pin_compatible('geos') }} | ||
| - matplotlib-base >=1.5,!=3.0.1 | ||
| - pyproj >=1.9.3,<3.4 | ||
| - pyshp >=1.2.0,<2.2 | ||
| - six >=1.10,<1.16 | ||
| test: | ||
| imports: | ||
| - mpl_toolkits.basemap | ||
| requires: | ||
| - pip | ||
| - {{ pin_subpackage('basemap-data') }} | ||
| commands: | ||
| - pip check | ||
| - python -c "from mpl_toolkits.basemap import Basemap" | ||
| about: | ||
| home: https://matplotlib.org/basemap | ||
| license: MIT | ||
| license_family: MIT | ||
| license_file: | ||
| - packages/basemap/LICENSE | ||
| summary: 'Plot on map projections using matplotlib' | ||
| description: | | ||
| Basemap toolkit is a library for plotting 2D data on maps in Python. | ||
| It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. | ||
| dev_url: https://github.com/matplotlib/basemap | ||
| doc_url: https://matplotlib.org/basemap/ | ||
| doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst | ||
|
|
||
| - name: basemap-data | ||
| script: build-basemap.sh # [not win] | ||
| script: bld-basemap.bat # [win] | ||
| build: | ||
| noarch: python | ||
| requirements: | ||
| host: | ||
| - python | ||
| - pip | ||
| - setuptools | ||
| - wheel | ||
| run: | ||
| - python >=3.6 | ||
| about: | ||
| home: https://matplotlib.org/basemap | ||
| license: LGPL-3.0-or-later | ||
|
skupr-anaconda marked this conversation as resolved.
|
||
| license_family: LGPL | ||
| license_file: packages/basemap_data_hires/COPYING.LESSER | ||
| summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. | ||
| dev_url: https://github.com/matplotlib/basemap | ||
| doc_url: https://matplotlib.org/basemap/ | ||
| doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst | ||
|
|
||
| - name: basemap-data-hires | ||
| script: build-basemap.sh # [not win] | ||
| script: bld-basemap.bat # [win] | ||
| build: | ||
| noarch: python | ||
| requirements: | ||
| host: | ||
| - python | ||
| - pip | ||
| - setuptools | ||
| - wheel | ||
| run: | ||
| - {{ pin_subpackage('basemap-data') }} | ||
| - python >=3.6 | ||
| about: | ||
| home: https://matplotlib.org/basemap | ||
| license: LGPL-3.0-or-later | ||
|
skupr-anaconda marked this conversation as resolved.
|
||
| license_family: LGPL | ||
| license_file: packages/basemap_data_hires/COPYING.LESSER | ||
| summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. | ||
| dev_url: https://github.com/matplotlib/basemap | ||
| doc_url: https://matplotlib.org/basemap/ | ||
| doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst | ||
|
|
||
|
|
||
|
|
||
| extra: | ||
| recipe-maintainers: | ||
| - molinav | ||
| - ocefpaf | ||
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
matplotlib has a quite different pinning for v1.3.1 https://github.com/matplotlib/basemap/blob/9389196d81dc44809537e8196d8e7cb87e6bb1ef/packages/basemap/requirements.txt#L25. Can it be better to update to v1.3.2?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The pinning is different around
numpy. I've pinned to thev1.3.2requirements.