Permalink
Browse files

ENH: pyproj no longer an optional dependency

pyproj is included in basemap, use the version included in that module.
  • Loading branch information...
jjhelmus committed Jan 24, 2014
1 parent 26c7a36 commit dca8e348ba7db19f675747e8b98acf987d634915
Showing with 6 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +2 −3 README.rst
  3. +1 −1 pyart/graph/__init__.py
  4. +1 −1 pyart/graph/gridmapdisplay.py
View
@@ -26,8 +26,8 @@ before_install:
# Install dependencies from the anaconda repo to the environment
- conda install --yes numpy scipy matplotlib netcdf4 nose
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install --yes basemap ; fi
- # Install additional packages from Binstar
- - conda install --yes -c http://conda.binstar.org/jjhelmus pyproj trmm_rsl
+ # Install RSL from binstar
+ - conda install --yes -c http://conda.binstar.org/jjhelmus trmm_rsl
# LP solver cylp and its dependancy CBC
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install --yes -c http://conda.binstar.org/jjhelmus cbc cylp ; fi
# LP solvers pyglpk based on GLPK
View
@@ -71,9 +71,8 @@ functionality is available of the the following modules are installed.
`GLPK <http://www.gnu.org/software/glpk/>`_ will also be required depending
on which wrapper is used.
-* `Basemap <http://matplotlib.org/basemap/>`_ and
- `pyproj <http://code.google.com/p/pyproj/>`_.
- If installed the ability to plot grids on geographic maps is available.
+* `Basemap <http://matplotlib.org/basemap/>`_. If installed the ability to
+ plot grids on geographic maps is available.
* `nose <http://nose.readthedocs.org/en/latest/>`_.
Required to run the Py-ART unit tests.
View
@@ -26,7 +26,7 @@
from .gridmapdisplay import GridMapDisplay
except ImportError:
import warnings
- warnings.warn('No grid plotting support, requires basemap and pyproj')
+ warnings.warn('No grid plotting support, requires basemap.')
try:
from .plot_rsl import RslDisplay
@@ -15,7 +15,7 @@
import numpy as np
import matplotlib.pyplot as plt
from mpl_toolkits.basemap import Basemap
-import pyproj
+from mpl_toolkits.basemap import pyproj
class GridMapDisplay():

0 comments on commit dca8e34

Please sign in to comment.