Merge branch 'region_tests' of https://github.com/joleroi/regions int…

…o tests
astropy · Mar 25, 2016 · 9f9c3fd · 9f9c3fd
2 parents de602a9 + d7d1ae0
commit 9f9c3fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ env:
         # The following versions are the 'default' for tests, unless
         # overidden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
-        - NUMPY_VERSION=1.9
+        - NUMPY_VERSION=1.10
         - ASTROPY_VERSION=stable
         - SETUP_CMD='test'
         - PIP_DEPENDENCIES=''
@@ -54,6 +54,8 @@ matrix:
           env: ASTROPY_VERSION=development
 
         # Try older numpy versions
+        - python: 2.7
+          env: NUMPY_VERSION=1.9
         - python: 2.7
           env: NUMPY_VERSION=1.8
         - python: 2.7

diff --git a/regions/conftest.py b/regions/conftest.py
@@ -6,7 +6,7 @@
 
 ## Uncomment the following line to treat all DeprecationWarnings as
 ## exceptions
-enable_deprecations_as_exceptions()
+#enable_deprecations_as_exceptions()
 
 ## Uncomment and customize the following lines to add/remove entries
 ## from the list of packages for which version numbers are displayed