Commit 20fff70f authored by kberry's avatar kberry
Browse files

Merge remote-tracking branch 'upstream/master' into slope

parents 9e1acacc a80c4259

.coveragerc

+11 −0
Original line number Diff line number Diff line
@@ -5,7 +5,18 @@ omit = 
    autocnet/fileio/ControlNetFileV0002_pb2.py

    autocnet/vis/graph_view.py

    autocnet/fileio/sqlalchemy_json/*

    autocnet/fileio/io_multibandimager.py

    autocnet/fileio/io_moon_minerology_mapper.py

    autocnet/fileio/header_parser.py

    autocnet/fileio/io_ccs.py

    autocnet/fileio/io_jsc.py

    autocnet/fileio/io_edr.py

    autocnet/fileio/lookup.py

    autocnet/fileio/utils.py

    autocnet/utils/folds.py

    autocnet/spectral/*

    bin/*

    */tests/*

exclude_lines =

    pragma: no cover

    def __repr__

.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 numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill cython

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill cython pyyaml

  # Activate the env

  - source activate test-env

autocnet/examples/Apollo15/adjacency.lis

0 → 100644
+6 −0
Original line number Diff line number Diff line 
AS15-M-0295_SML.png

AS15-M-0296_SML.png

AS15-M-0297_SML.png

AS15-M-0298_SML.png

AS15-M-0299_SML.png

AS15-M-0300_SML.png