Merge pull request #12 from spectraphilic/mapping-streamline

Mapping refactoring. The region database has been moved to its own YAML file.
spectraphilic · Sep 29, 2016 · c3961c3 · c3961c3
2 parents 1c34011 + f3cde17
commit c3961c3
Show file tree

Hide file tree

Showing 13 changed files with 3,006 additions and 3,503 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,11 @@ install:
   - sudo apt-get --assume-yes install gfortran
 
   # Install dependencies in conda
-  - conda create -n reflex_env python=$TRAVIS_PYTHON_VERSION numpy libgfortran netcdf4 matplotlib pandas pytest coverage pip xarray basemap
+  - conda create -n reflex_env python=$TRAVIS_PYTHON_VERSION libgfortran
   - source activate reflex_env
+  - conda install pyqt   # seems required when running matplotlib
+  # Install the remaining requeriments
+  - cat requirements.txt | xargs conda install
 
   # Install dependencies in PyPI
   - pip install pytest-cov coveralls

diff --git a/examples/small-plot.py b/examples/small-plot.py
@@ -13,14 +13,13 @@
 #builtins
 import os
 
-import numpy as np
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-from mpl_toolkits.basemap import shiftgrid, addcyclic
+import numpy as np
+from mpl_toolkits.basemap import addcyclic
 
 import reflexible as rf
-import reflexible.conv2netcdf4 as conv
-import reflexible.legacy.mapping as mp
+import reflexible.mapping as mp
 
 
 def plot_backward(SOURCE_FILE, OUTPUT_DIR):

diff --git a/reflexible/legacy/__init__.py → legacy/__init__.py b/reflexible/legacy/__init__.py → legacy/__init__.py