Commit 43e66902 authored by Jay's avatar Jay
Browse files

Merge branch 'dev' of https://github.com/USGS-Astrogeology/autocnet

parents 429e50d1 f2242f97

.gitignore

+1 −0
Original line number Diff line number Diff line 
#iPython

/.ipynb*

*.ipynb*



#PyCharm

/.idea

.travis.yml

+3 −5
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ install: 
  - conda config --add channels jlaura

  - conda config --set ssl_verify false

  - conda install python=$PYTHON_VERSION

  - conda install -c conda-forge numpy

  - conda install -c jlaura plio opencv3=3.0.0

  - conda install -c conda-forge numpy opencv

  - conda install -c jlaura plio

  - conda install -c conda-forge vlfeat

  - conda install -c menpo cyvlfeat

  - pip install pillow pysal

  - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy

  - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy geopandas



  # Development installation

  - conda install pytest pytest-cov coverage sh anaconda-client
@@ -66,8 +66,6 @@ install: 


script:

  - pytest --cov=autocnet

  # clean up any remaining processes...

  - if [ $TRAVIS_OS_NAME == "linux" ]; then killall5; fi



after_success:

  # Upload to anaconda and push to coveralls

HISTORY.rst

+3 −3
Original line number Diff line number Diff line 
.. :changelog:



History

-------

Changelog

---------



0.1.0 (2015-01-11)

---------------------





* First release on PyPI.

README.rst

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ AutoCNet 
.. image:: https://coveralls.io/repos/USGS-Astrogeology/autocnet/badge.svg?branch=master&service=github

    :target: https://coveralls.io/github/USGS-Astrogeology/autocnet?branch=master



.. image:: https://readthedocs.org/projects/autocnet/badge/?version=latest

    :target: http://autocnet.readthedocs.org/en/latest/

.. image:: https://img.shields.io/badge/Docs-latest-green.svg

    :target: hhttps://usgs-astrogeology.github.io/autocnet/

    :alt: Documentation Status



.. image:: https://badge.waffle.io/USGS-Astrogeology/autocnet.png?label=ready&title=Ready
@@ -25,7 +25,7 @@ AutoCNet 


Automated sparse control network generation to support photogrammetric control of planetary image data.



* Documentation: https://autocnet.readthedocs.org.

* Documentation: https://usgs-astrogeology.github.io/autocnet/



Installation Instructions

-------------------------
@@ -37,6 +37,6 @@ We suggest using Anaconda Python to install Autocnet within a virtual environmen 
  * ``conda create -n <your_environment_name> python=3 && source activate <your_environment_name>``

1. Bring up a command line and add three channels to your conda config (``~/condarc``):

  * ``conda config --add channels conda-forge``

  * ``conda condig --add channels jlaura``

  * ``conda config --add channels jlaura``

  * ``conda config --add channels menpo``

1. Finally, install autocnet: ``conda install -c jlaura autocnet-dev``

autocnet.egg-info/PKG-INFO

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
Metadata-Version: 1.1

Name: autocnet

Version: 0.1.0

Summary: R&D for automated control network generation.

Home-page: https://github.com/jlaura@usgs.gov/autocnet

Author: Jay Laura

Author-email: jlaura@usgs.gov

License: ISCL

Description: ===============================

        AutoCNet

        ===============================

        

        .. image:: https://img.shields.io/pypi/v/autocnet.svg

                :target: https://pypi.python.org/pypi/autocnet

        

        .. image:: https://img.shields.io/travis/jlaura@usgs.gov/autocnet.svg

                :target: https://travis-ci.org/jlaura@usgs.gov/autocnet

        

        .. image:: https://readthedocs.org/projects/autocnet/badge/?version=latest

                :target: https://readthedocs.org/projects/autocnet/?badge=latest

                :alt: Documentation Status

        

        

        R&D for automated control network generation.

        

        * Free software: ISC license

        * Documentation: https://autocnet.readthedocs.org.

        

        Features

        --------

        

        * TODO

        

        Credits

        ---------

        

        Tools used in rendering this package:

        

        *  Cookiecutter_

        *  `cookiecutter-pypackage`_

        

        .. _Cookiecutter: https://github.com/audreyr/cookiecutter

        .. _`cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage

        

        

        

        

        History

        -------

        

        0.1.0 (2015-01-11)

        ---------------------

        

        * First release on PyPI.

        

Keywords: autocnet

Platform: UNKNOWN

Classifier: Development Status :: 2 - Pre-Alpha

Classifier: Intended Audience :: Developers

Classifier: License :: OSI Approved :: ISC License (ISCL)

Classifier: Natural Language :: English

Classifier: Programming Language :: Python :: 2

Classifier: Programming Language :: Python :: 2.6

Classifier: Programming Language :: Python :: 2.7

Classifier: Programming Language :: Python :: 3

Classifier: Programming Language :: Python :: 3.3

Classifier: Programming Language :: Python :: 3.4