Merge pull request #15 from ocefpaf/rename

Rename from proj.4 to proj4 to match defaults

.travis.yml

@@ -20,9 +20,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

README.md

@@ -1,7 +1,7 @@
-About proj.4
-============
+About proj4
+===========
 
-Home: http://trac.osgeo.org/proj/
+Home: http://trac.osgeo.org/proj
 
 Package license: MIT
 
@@ -11,25 +11,25 @@ Summary: Cartographic projection software.
 
 
 
-Installing proj.4
-=================
+Installing proj4
+================
 
-Installing `proj.4` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with:
+Installing `proj4` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with:
 
 ```
 conda config --add channels conda-forge
 ```
 
-Once the `conda-forge` channel has been enabled, `proj.4` can be installed with:
+Once the `conda-forge` channel has been enabled, `proj4` can be installed with:
 
 ```
-conda install proj.4
+conda install proj4
 ```
 
-It is possible to list all of the versions of `proj.4` available on your platform with:
+It is possible to list all of the versions of `proj4` available on your platform with:
 
 ```
-conda search proj.4 --channel conda-forge
+conda search proj4 --channel conda-forge
 ```
 
 
@@ -71,27 +71,27 @@ Terminology
 Current build status
 ====================
 
-Linux: [![Circle CI](https://circleci.com/gh/conda-forge/proj.4-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/proj.4-feedstock)
-OSX: [![TravisCI](https://travis-ci.org/conda-forge/proj.4-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/proj.4-feedstock)
-Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/proj.4-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/proj-4-feedstock/branch/master)
+Linux: [![Circle CI](https://circleci.com/gh/conda-forge/home-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/home-feedstock)
+OSX: [![TravisCI](https://travis-ci.org/conda-forge/home-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/home-feedstock)
+Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/home-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/home-feedstock/branch/master)
 
 Current release info
 ====================
-Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/proj.4/badges/version.svg)](https://anaconda.org/conda-forge/proj.4)
-Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/proj.4/badges/downloads.svg)](https://anaconda.org/conda-forge/proj.4)
+Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/proj4/badges/version.svg)](https://anaconda.org/conda-forge/proj4)
+Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/proj4/badges/downloads.svg)](https://anaconda.org/conda-forge/proj4)
 
 
-Updating proj.4-feedstock
-=========================
+Updating proj4-feedstock
+========================
 
-If you would like to improve the proj.4 recipe or build a new
+If you would like to improve the proj4 recipe or build a new
 package version, please fork this repository and submit a PR. Upon submission,
 your changes will be run on the appropriate platforms to give the reviewer an
 opportunity to confirm that the changes result in a successful build. Once
 merged, the recipe will be re-built and uploaded automatically to the
 `conda-forge` channel, whereupon the built conda packages will be available for
 everybody to install and use from the `conda-forge` channel.
-Note that all branches in the conda-forge/proj.4-feedstock are
+Note that all branches in the conda-forge/proj4-feedstock are
 immediately built and any created packages are uploaded, so PRs should be based
 on branches in forks and branches in the main repository should only be used to
 build distinct package versions.

appveyor.yml

@@ -56,7 +56,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

@@ -1,7 +1,7 @@
 {% set version = "4.9.3" %}
 
 package:
-  name: proj.4
+  name: proj4
   version: {{ version }}
 
 source:
@@ -20,17 +20,23 @@ requirements:
   build:
     - python  # [win]
     - cmake  # [win]
+    - vc 9  # [win and py27]
+    - vc 10  # [win and py34]
+    - vc 14  # [win and py35]
   run:
-    # The VS version is important. See # https://github.com/SciTools/conda-recipes-scitools/issues/94.
-    - python  # [win]
+    - vc 9  # [win and py27]
+    - vc 10  # [win and py34]
+    - vc 14  # [win and py35]
 
 test:
   commands:
     - echo -105 40 | proj +proj=utm +zone=13 +ellps=WGS84
     - echo -117 30 | cs2cs +proj=latlong +datum=NAD27 +to +proj=latlong +datum=NAD83
+    #- conda inspect linkages -p $PREFIX proj4  # [not win]
+    #- conda inspect objects -p $PREFIX proj4  # [osx]
 
 about:
-  home: http://trac.osgeo.org/proj/
+  home: http://trac.osgeo.org/proj
   license: MIT
   summary: 'Cartographic projection software.'