Merge pull request #125 from ocefpaf/rename_proj4_dep

Rename proj4 dep

.travis.yml

@@ -28,9 +28,9 @@ before_install:
 
 install:
     - |
-      MINICONDA_URL="http://repo.continuum.io/miniconda"
+      MINICONDA_URL="https://repo.continuum.io/miniconda"
       MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
-      curl -O "${MINICONDA_URL}/${MINICONDA_FILE}"
+      curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
       bash $MINICONDA_FILE -b
 
       source /Users/travis/miniconda3/bin/activate root

appveyor.yml

@@ -86,7 +86,7 @@ install:
 
     # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
     - cmd: rmdir C:\cygwin /s /q
-    - appveyor DownloadFile "https://raw.githubusercontent.com/pelson/Obvious-CI/master/bootstrap-obvious-ci-and-miniconda.py"
+    - appveyor DownloadFile "https://raw.githubusercontent.com/conda-forge/conda-smithy/e976c7e84bb3c4846e7562afd1a42c4b535b51f5/bootstrap-obvious-ci-and-miniconda.py"
     - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %TARGET_ARCH% %CONDA_PY:~0,1% --without-obvci
 
     # Add a hack to switch to `conda` version `4.1.12` before activating.

recipe/meta.yaml

@@ -7,7 +7,7 @@ package:
 source:
   fn: gdal-{{ version }}.tar.gz
   url: http://download.osgeo.org/gdal/{{ version }}/gdal-{{ version }}.tar.gz
-  sha256: 69761c38acac8c6d3ea71304341f6982b5d66125a1a80d9088b6bfd2019125c9 
+  sha256: 69761c38acac8c6d3ea71304341f6982b5d66125a1a80d9088b6bfd2019125c9
   patches:
     - clang.patch  # [osx]
     - prepend-dll.patch  # [win]
@@ -18,7 +18,7 @@ source:
     - install_scripts.patch
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:
@@ -29,7 +29,7 @@ requirements:
     - hdf4
     - hdf5 1.8.17|1.8.17.*
     - geos 3.4.*
-    - proj.4 4.9.3
+    - proj4 4.9.3
     - xerces-c
     - libnetcdf 4.4.*
     - libdap4 3.18.*  # [not win]
@@ -57,7 +57,7 @@ requirements:
     - hdf4
     - hdf5 1.8.17|1.8.17.*
     - geos 3.4.*
-    - proj.4 4.9.3
+    - proj4 4.9.3
     - xerces-c
     - libnetcdf 4.4.*
     - libdap4 3.18.*  # [not win]
@@ -107,7 +107,6 @@ test:
     - gdalwarp --version
     - gdalinfo --formats
     - gdalinfo http://thredds.nersc.no/thredds/dodsC/greenpath/Model/topaz  # [not win]
-    # Commented out below since it seems to be broken for now
     #- conda inspect linkages -p $PREFIX gdal  # [not win]
     #- conda inspect objects -p $PREFIX gdal  # [osx]