Commit c2c1f24c authored by Jay's avatar Jay Committed by jay
Browse files

Travis updates to get skimage in

parent a621692d

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ install: 
  - conda info -a



  # Create a virtual env and install dependencies

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose gdal numpy pillow scipy pandas networkx

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose gdal numpy pillow scipy pandas networkx scikit-image

  # Activate the env

  - source activate test-env

autocnet/matcher/tests/test_feature_extractor.py

+1 −1
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ import sys 
sys.path.insert(0, os.path.abspath('..'))



from .. import feature_extractor



from autocnet.fileio import io_gdal





class TestFeatureExtractor(unittest.TestCase):

    def setUp(self):

        self.dataset = io_gdal.GeoDataset(get_path('Mars_MGS_MOLA_ClrShade_MAP2_0.0N0.0_MERC.tif'))

docs/conf.py

+2 −1
Original line number Diff line number Diff line
@@ -294,7 +294,8 @@ class Mock(MagicMock): 
        return Mock()



# All imported libraries should be added to this mock modules list.

MOCK_MODULES = ['proj4', 'numpy', 'pandas', 'scipy', 'osgeo', 'cv2']

MOCK_MODULES = ['proj4', 'numpy', 'pandas', 'scipy', 'osgeo', 'cv2',

                'scikit-image', 'skimage']

sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)



# NumpyDoc Options

requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ pvl>=0.2.0 
protobuf==3.0.0b2

networkx

pandas

scikit-image