Unverified Commit 7fed125e authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Updates to get docs rendering across the library. (#427)

* Updates to get docs rendering across the library.

* Travis deploy docs

* Missed the nbsphinx doc install

* Moves doc push before conda to avoid env swapping
parent 149c975e
Loading
Loading
Loading
Loading
+13 −6
Original line number Diff line number Diff line
@@ -55,17 +55,24 @@ install:
  # Install dependencies
  - conda env update -n test -f environment.yml
  - export PROJ_LIB=$CONDA_PREFIX/share/proj 
  - pip install travis-sphinx 
  - conda install -c conda-forge nbsphinx

script:
  - autocnet_config=config/test_config.yml pytest -v autocnet
  - travis-sphinx build --source=docs --nowarn # The sphinx build script

after_success:
  - coveralls
  # Need to do the build in the root
  - source deactivate
  - conda install conda-build anaconda-client
  - conda config --set anaconda_upload yes
  - conda build --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION -c conda-forge -c menpo -c usgs-astrogeology conda
  - |
  if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
    travis-sphinx deploy;
    source deactivate;
    conda install conda-build anaconda-client;
    conda config --set anaconda_upload yes;
    conda build --token $CONDA_UPLOAD_TOKEN --python $PYTHON_VERSION -c conda-forge -c menpo -c usgs-astrogeology conda;
   
  fi

notifications:
  webhooks:
+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ from autocnet.camera.utils import crossform
from cv2 import triangulatePoints



def compute_epipoles(f):
    """
    Compute the epipole and epipolar prime
@@ -71,7 +70,7 @@ def triangulate(pt, pt1, p, p1):

    References
    ----------
    .. [Hartley2003]
    [Hartley2003]_

    Parameters
    ----------
+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ import numpy as np
import pandas as pd
import scipy
from matplotlib import pyplot as plt
from scipy.misc import imresize
from sqlalchemy import (Boolean, Column, Float, ForeignKey, Integer,
                        LargeBinary, String, UniqueConstraint, create_engine,
                        event, orm, pool)
@@ -42,9 +41,6 @@ from knoten import csm
from plio.io.io_controlnetwork import from_isis, to_isis
from plio.io.io_gdal import GeoDataset

from pysis.exceptions import ProcessError
from pysis.isis import campt

from shapely import wkt
from shapely.geometry.multipolygon import MultiPolygon
from shapely.geometry import Point
@@ -216,8 +212,10 @@ def generate_ground_points(ground_db_config, nspts_func=lambda x: int(round(x,1)
    Provided a config file which points to a database containing ground image path and geom information,
    generates ground points on these images within the range of a source database's images. For example,
    if creating a CTX mosaic which is grounded using themis data, the config files would look like:
        
        CTX_config -> located in config/[config_name].yml
        database:

            type: 'postgresql'
            username: 'jay'
            password: 'abcde'
@@ -228,6 +226,7 @@ def generate_ground_points(ground_db_config, nspts_func=lambda x: int(round(x,1)
            timeout: 500

        Themis_config -> passed in to this function as ground_db_config
        
        ground_db_config = {'username':'jay',
                            'password':'abcde',
                            'host':'autocnet.wr.usgs.gov',

docs/developers/history.rst

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
.. include:: ../../HISTORY.rst
+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@

   contributing
   authors
   history
Loading