Using default proj4

SciTools · Oct 11, 2015 · 9eb2a5c · 9eb2a5c
1 parent cea5abe
commit 9eb2a5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 33 deletions.
diff --git a/cartopy/meta.yaml b/cartopy/meta.yaml
@@ -10,8 +10,8 @@ source:
     - cartopy.win.patch  # [win]
 
 build:
-  number: 0  # [not linux]
-  number: 1  # [linux]
+  number: 1  # [not linux]
+  number: 2  # [linux]
 
 requirements:
   build:
@@ -21,7 +21,7 @@ requirements:
     # We must bake the numpy version into the build string.
     - numpy *
     - cython
-    - proj4
+    - proj.4
     - geos
     # On OSX We need to effectively pin the geos version to the
     # one used by the specific shapely being targetted (we're letting
@@ -30,7 +30,7 @@ requirements:
     - owslib
     - pyshp
     - pyepsg
-  
+
   run:
     - python
     - six
@@ -39,7 +39,7 @@ requirements:
     - pillow
     - owslib
     - numpy
-    - proj4
+    - proj.4
     - shapely >=1.5.6
     - scipy
     - pyshp

diff --git a/proj4/bld.bat b/proj4/bld.bat
diff --git a/proj4/build.sh b/proj4/build.sh
diff --git a/proj4/meta.yaml b/proj4/meta.yaml