Fix testing

Author: astrofrog

.continuous-integration/travis/setup_dependencies_common.sh

@@ -30,7 +30,7 @@ $CONDA_INSTALL pytest Cython jinja2 psutil
 # OPTIONAL DEPENDENCIES
 if $OPTIONAL_DEPS
 then
-  $CONDA_INSTALL scipy h5py matplotlib pyyaml scikit-image
+  $CONDA_INSTALL scipy h5py matplotlib pyyaml scikit-image pandas
   pip install beautifulsoup4
 fi
 

astropy/table/tests/test_table.py

@@ -15,6 +15,13 @@
 from ... import units as u
 from .conftest import MaskedTable
 
+try:
+    import pandas
+except ImportError:
+    HAS_PANDAS = False
+else:
+    HAS_PANDAS = True
+
 
 class SetupData(object):
     def _setup(self, table_types):
@@ -1402,6 +1409,7 @@ def test_table_init_from_degenerate_arrays(table_types):
 
 class TestPandas(object):
 
+    @pytest.mark.skipif('not HAS_PANDAS')
     def test_simple(self):
 
         from pandas import DataFrame
@@ -1436,6 +1444,7 @@ def test_simple(self):
             else:
                 assert_allclose(t[column], t2[column])
 
+    @pytest.mark.skipif('not HAS_PANDAS')
     def test_2d(self):
 
         from pandas import DataFrame
@@ -1448,6 +1457,7 @@ def test_2d(self):
             d = t.to_pandas()
         assert exc.value.args[0] == "Cannot convert a table with multi-dimensional columns to a pandas DataFrame"
 
+    @pytest.mark.skipif('not HAS_PANDAS')
     def test_mixin(self):
 
         from pandas import DataFrame