Commit fe41b890 authored Mar 28, 2018 by jlaura Committed by GitHub Mar 28, 2018

Update Conda Build (#243)

* Adds a CPU baseg ring matching implementation

* Fixes rounding in doctest on new travis systems.

* Fixes rounding in doctest on new travis systems.

* Ammending last commit - typo.

* adds conditional use of OpenCV Sift/Surf

* Updated tutorial for API changes

* Stubs for AutoCNet Service

* Testing autocnet as a service

* Fixes camera identity

* Updates to generalize data structures for autocnet server

* Updates fundamental and adds trifocal properly

* Backing out camera stuff that belongs someplace else

* Updates tests for API changes.

* Updates findFundamentalMat for OpenCV API Change

* Updates for @acpaquette

* Fixes np array comparison tobe canonical and worth with mixed types

* Updates docstring test with spaces causing failures

* Updates for conda build

* GDAL version mismatch issues

* GDAL version mismatch issues

* GDAL version mismatch issues

parent 0ebe7e76

.travis.yml

+1 −5

Original line number	Diff line number	Diff line
		@@ -41,11 +41,7 @@ before_install:
		- conda config --add channels menpo
		- conda config --add channels usgs-astrogeology
		- conda config --set ssl_verify false
		- conda install -c conda-forge vlfeat
		- conda install -c menpo cyvlfeat
		- pip install pillow pysal
		- conda install -c conda-forge scipy networkx numexpr dill cython pyyaml matplotlib runipy geopandas opencv numpy gdal
		- conda install -c usgs-astrogeology plio
		- conda install -c conda-forge vlfeat cyvlfeat plio scipy networkx numexpr cython matplotlib pillow runipy geopandas opencv numpy gdal

		# Development installation
		- conda install pytest pytest-cov coverage sh anaconda-client

conda/meta.yaml

+12 −11

Original line number	Diff line number	Diff line
		@@ -8,33 +8,34 @@ source:
		requirements:
		build:
		- python
		- plio
		- opencv3
		- vlfeat
		- cyvlfeat
		- pillow
		- matplotlib
		- scipy
		- networkx
		- numexpr
		- cython
		- pyyaml
		- pysal

		- matplotlib
		- geopandas
		- opencv3
		- numpy
		- plio
		- gdal
		run:
		- python
		- plio
		- opencv3
		- vlfeat
		- cyvlfeat
		- pillow
		- matplotlib
		- scipy
		- networkx
		- numexpr
		- cython
		- pyyaml
		- jupyter
		- matplotlib
		- geopandas
		- opencv3
		- numpy
		- plio
		- gdal

		test:
		imports: