Merge b0bf311 into 0cf5b2a

.travis.yml

@@ -21,8 +21,6 @@ addons:
     apt:
         packages:
             - graphviz
-            - texlive-latex-extra
-            - dvipng
 
 env:
     global:
@@ -40,21 +38,17 @@ env:
         - SETUP_XVFB=True
         - ASTROPY_USE_SYSTEM_PYTEST=1
 
-    matrix:
-        # Make sure that egg_info works without dependencies
-        - SETUP_CMD='egg_info'
-
 matrix:
     include:
+        # Make sure that egg_info works without dependencies
+        - env: SETUP_CMD='egg_info'
 
         # Do a coverage test in Python 3.7
         - env: SETUP_CMD='test --coverage'
                CONDA_CHANNELS='conda-forge astropy'
 
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
-        - env: PYTHON_VERSION=2.7
-               SETUP_CMD='build_docs -w'
         - env: PYTHON_VERSION=3.6
                SETUP_CMD='build_docs -w'
                CONDA_CHANNELS='conda-forge astropy'
@@ -63,7 +57,6 @@ matrix:
         - env: SETUP_CMD='test'
                CONDA_DEPENDENCIES='Cython pytest-arraydiff'
 
-
         # Try Astropy development version
         - env: ASTROPY_VERSION=development
                CONDA_CHANNELS='conda-forge astropy'
@@ -75,9 +68,6 @@ matrix:
                NUMPY_VERSION=1.10
                ASTROPY_VERSION=3.0
 
-        # Try numpy pre-release
-        - env: NUMPY_VERSION=prerelease
-
         # Do a PEP8 test with pycodestyle
         - env: MAIN_CMD='pycodestyle regions --count' SETUP_CMD=''
 

regions/io/fits/tests/test_fits_region.py

@@ -81,7 +81,6 @@ def test_only_pixel_regions():
     with pytest.raises(TypeError) as err:
         fits_region_objects_to_table([reg_sky])
 
-    print(str(err))
     assert 'Every region must be a pixel region' in str(err)
 
 

setup.cfg

@@ -3,6 +3,11 @@ source-dir = docs
 build-dir = docs/_build
 all_files = 1
 
+[build_docs]
+source-dir = docs
+build-dir = docs/_build
+all_files = 1
+
 [upload_docs]
 upload-dir = docs/_build/html
 show-response = 1