Merge pull request #18 from wpreimes/master

Add more_itertools to requirements
TUW-GEO · May 10, 2019 · ceacf69 · ceacf69
2 parents 082c8e2 + 17c6201
commit ceacf69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ notifications:
 python:
   # We don't actually use the Travis Python, but this keeps it organized.
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 install:
@@ -27,8 +26,8 @@ install:
   - conda info -a
 
   - conda create -n ismn python=${TRAVIS_PYTHON_VERSION}
+  - conda env update -f environment.yml -n ismn
   - source activate ismn
-  - conda env update -f environment.yml
   # - python setup.py install
   # - pip install -r test-requirements.txt
   - conda list

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+Unreleased
+==========
+-
+
 Version 0.3.1
 ===========
 - Set allow_pickle to True when loading metadata

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
-# Add your requirements here like:
+# install cartopy via conda first
 pygeogrids
 numpy
 pandas
-matplotlib>3
+matplotlib
 configparser
 scipy
-# cartopy
-cython
+cython
+more_itertools