basemap v1.2.1

.azure-pipelines/azure-pipelines-win.yml

@@ -13,11 +13,11 @@ jobs:
       win_c_compilervs2015cxx_compilervs2015python3.6:
         CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6
         CONDA_BLD_PATH: D:\\bld\\
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
       win_c_compilervs2015cxx_compilervs2015python3.7:
         CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7
         CONDA_BLD_PATH: D:\\bld\\
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
   steps:
     # TODO: Fast finish on azure pipelines?
     - script: |

.azure-pipelines/run_docker_build.sh

@@ -39,7 +39,7 @@ if [ -z "$CONFIG" ]; then
 fi
 
 if [ -z "${DOCKER_IMAGE}" ]; then
-    SHYAML_INSTALLED="$(shyaml --version || echo NO)"
+    SHYAML_INSTALLED="$(shyaml -h || echo NO)"
     if [ "${SHYAML_INSTALLED}" == "NO" ]; then
         echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7"
         DOCKER_IMAGE="condaforge/linux-anvil-comp7"

.github/CODEOWNERS

@@ -1 +1 @@
-* @ocefpaf
+* @ocefpaf

README.md

@@ -15,14 +15,7 @@ Current build status
 ====================
 
 
-<table><tr>
-    <td>Appveyor</td>
-    <td>
-      <a href="https://ci.appveyor.com/project/conda-forge/basemap-feedstock/branch/master">
-        <img alt="windows" src="https://img.shields.io/appveyor/ci/conda-forge/basemap-feedstock/master.svg?label=Windows">
-      </a>
-    </td>
-  </tr>
+<table>
 
   <tr>
     <td>Azure</td>

build-locally.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This file has been generated by conda-smithy in order to build the recipe
 # locally.
@@ -55,4 +55,4 @@ def main(args=None):
 
 
 if __name__ == "__main__":
-    main()
+    main()

conda-forge.yml

@@ -5,3 +5,8 @@ max_py_ver: '37'
 max_r_ver: '35'
 travis:
   secure: {BINSTAR_TOKEN: ESHO3IQAsYAgHAS74dh4iC9L2kXKYQhj2K0i8O4axmrTdFf6vNrxf+Fnfb9U56k63qu+o5vBH66Kp2CR9T6eaH2Wg0KwOuKVSPiwmdc17QA/JGsgBldc4fiammT27pLRjgy+ewfNnxUMIlccMKXqVbTO6z+6pkzfJcr4gWlUjAN46eOWCcYZ2RiUdVCsUgZytEU7+EEO+optlp22h1ADNN8QBpVJ3MdK/G57P/VzBa+79ZTRfQUKzW9Vv4ub+T4AszRIprorx/ulL/XxgmN0qtEcSClBYdrMKl/3nZ5rK9jtqVkMLyCXhUV0oUoZMZ9M8VTRpM+ya99iHGEg2EazDmf4rI/H6TFKJtgRlVLz427EPnwq4JtNaozonsPizdHNu7JAY/rWf/h61aW3i3B/tqGW+RiuWKfsK7yBqgmPv/gHAzTSlD0yQEAXlirHEUJzrg/tbCB/5xxXKYjZZaFdDJZVHzeaULbW/MVVjOWdff1B7T+zyzbBj5xIymmqzYAaahFJDSLVxREwLH1hGJS2jMzwmlCFNZw8rRkv4hlC2OylyGWlogOQEgjqTRLJdE2pG+6sAQNKC3zswNNGGMUkOWUaVOrI4k/5nK6miJSQyUzXzGAhbZmX4f0YgOy3oI1KZ5f1Y0UxhMiC7GCRm6ROeDkEkYc4T1QQGUVxZ27U0SM=}
+provider:
+  osx: azure
+  linux: azure
+  win: azure
+

recipe/basemap-1.0.8dev-datadir.patch → recipe/data.patch

@@ -1,18 +1,35 @@
---- lib/mpl_toolkits/basemap/__init__.py	2016-03-23 10:25:48.150934435 -0300
-+++ lib/mpl_toolkits/basemap/__init__.py	2016-03-23 14:22:02.486302483 -0300
-@@ -45,7 +45,10 @@
-     if not os.path.isdir(basemap_datadir):
-         raise RuntimeError('Path in environment BASEMAPDATA not a directory')
+--- basemap-1.2.1rel.orig/lib/mpl_toolkits/basemap/__init__.py	2019-08-07 22:03:01.000000000 -0300
++++ basemap-1.2.1rel/lib/mpl_toolkits/basemap/__init__.py	2019-08-08 11:15:02.145868394 -0300
+@@ -53,15 +53,10 @@
+ import _geoslib
+ import functools
+
+-# basemap data files now installed in lib/matplotlib/toolkits/basemap/data
+-# check to see if environment variable BASEMAPDATA set to a directory,
+-# and if so look for the data there.
+-if 'BASEMAPDATA' in os.environ:
+-    basemap_datadir = os.environ['BASEMAPDATA']
+-    if not os.path.isdir(basemap_datadir):
+-        raise RuntimeError('Path in environment BASEMAPDATA not a directory')
++if os.name == 'nt':
++    basemap_datadir = os.path.join(sys.prefix, 'Library', 'share', 'basemap')
  else:
 -    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+  if os.name == 'nt':
-+    basemap_datadir = os.path.join(sys.prefix, 'Library', 'share', 'basemap')
-+  else:
 +    basemap_datadir = os.path.join(sys.prefix, 'share', 'basemap')
-
- __version__ = '1.0.8'
-
-@@ -1205,11 +1208,12 @@
+
+ __version__ = '1.2.1'
+
+@@ -154,7 +149,8 @@
+              }
+
+ # create dictionary that maps epsg codes to Basemap kwargs.
+-epsgf = open(os.path.join(basemap_datadir, 'epsg'))
++pyproj_datadir = os.environ['PROJ_LIB']
++epsgf = open(os.path.join(pyproj_datadir,'epsg'))
+ epsg_dict={}
+ for line in epsgf:
+     if line.startswith("#"):
+@@ -1222,11 +1218,12 @@
          read boundary data, clip to map projection region.
          """
          msg = dedent("""
@@ -30,11 +47,9 @@
          # only gshhs coastlines can be polygons.
          if name != 'gshhs': as_polygons=False
          try:
-@@ -2004,8 +2008,12 @@
-
-         returns a matplotlib.patches.LineCollection object.
+@@ -1981,6 +1978,11 @@
          """
--        ax = ax or self._check_ax()
+         ax = ax or self._check_ax()
          gis_file = os.path.join(basemap_datadir,'UScounties')
 +        if not os.path.isfile(gis_file + '.shp'):
 +            msg = ('Cannot find {}.shp\nYou can install it with'

recipe/meta.yaml

@@ -1,18 +1,17 @@
-{% set version = "1.2.0" %}
+{% set version = "1.2.1" %}
 
 package:
   name: basemap
   version: {{ version }}
 
 source:
   url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz
-  sha256: bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a
+  sha256: 3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7
   patches:
-    - basemap-1.0.8dev-datadir.patch
-    - use_proj_data.patch
+    - data.patch
 
 build:
-  number: 4
+  number: 0
   skip: True  # [win and py2k]
 
 requirements:
@@ -25,17 +24,19 @@ requirements:
     - cython
     - numpy
     - geos
-    - matplotlib-base >=1.0.0
-    - pyproj >=1.9.3,<2
+    - matplotlib-base >=1.0.0,!=3.0.1
+    - pyproj >=1.9.3
+    - proj4 >=4.9.3,<6
     - pyshp >=1.2.0
     - six
   run:
     - python
     - {{ pin_compatible('numpy') }}
     - geos
-    - matplotlib-base >=1.0.0
-    - pyproj >=1.9.3,<2
+    - matplotlib-base >=1.0.0,!=3.0.1
+    - pyproj >=1.9.3
     - pyshp >=1.2.0
+    - proj4 >=4.9.3,<6
     - six
 
 test: