Attempt to install numpy before rasterio during tests.

bopen · Apr 2, 2016 · f0aed00 · f0aed00
1 parent 9b54c64
commit f0aed00
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 future==0.15.2
 appdirs==1.4.0
+numpy==1.11.0
 rasterio==0.33.0
 Fiona==1.6.3.post1
diff --git a/setup.py b/setup.py
@@ -53,6 +53,7 @@ def read(fname):
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',

diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,22 @@
 [tox]
-envlist = docs, py27, py33, py34, py35, pypy, pypy3, quality-check
+envlist = docs, py27, py33, py34, py35, quality-check
 
 [testenv]
-deps = -r{toxinidir}/requirements-tests.txt
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-tests.txt
 commands = py.test {posargs:tests}
 
 [testenv:docs]
-deps = -r{toxinidir}/requirements-docs.txt
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-docs.txt
 commands = sphinx-build -W -b html docs docs/html
 
 [testenv:quality-check]
 usedevelop = true
 basepython = python2.7
-deps = -r{toxinidir}/requirements-tests.txt
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-tests.txt
 commands = py.test --pep8 --flakes --mccabe --cov=elevation --cov-report= --cache-clear {posargs}