Merge pull request #4 from fmigneault/infer-config

Infer config + docs improvements

.dockerignore

@@ -1,11 +1,44 @@
-Dockerfile
+# Docker
+[Dd]ocker
+[Dd]ockerfile
 .dockerignore
+
+# Git
 .git
+.github
+.gitignore
+
+# Travis
 .travis.yml
-*.py[cod]
+
+# installer
+#Makefile
+[Mm]akefile.config
+downloads
+
+# Environments
+env
+.ve
+.env
+venv*/
+pyvenv*/
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Python / Extensions etc.
+*~
+.*.sw[po]
+.build
+.cache
+*.mo
 *.so
-*.egg
+*.py[cod]
+*.bak
+*.sqlite
+*.egg[s]
 *.egg-info
+*egg[s]__pycache__
 dist
 build
 downloads
@@ -17,41 +50,87 @@ var
 sdist
 wheelhouse
 develop-eggs
+
+# installation
+[Bb]in
 .installed.cfg
 lib
 lib64
 /data/
 /src
-venv*/
-pyvenv*/
-pip-log.txt
-*.log
+
+# Unit test / Coverage reports
+.cache
 .coverage
-.tox
+coverage
+coverage.*
 .coverage.*
+.pytest
+.pytest_cache
 .pytest_cache/
+.tox
 nosetests.xml
-coverage.xml
+unit_tests/testdata.json
+**/*.log
+**/*.lock
+testdata.json
 htmlcov
-*.mo
-.mr.developer.cfg
+reports
+tests
+
+# R
+*.Rhistory
+
+# Eclipse / PyDev
 .project
 .pydevproject
-.idea
+.settings
+
+# vscode
 .vscode
+
+# PyCharm
+*.idea
+
+# Intellij
 *.iml
+
+# Kate
+*.kate-swp
+
+# Sublime Text Editor
+*.sublime*
+
+# other
 *.komodoproject
+
+# sphinx
+docs
+docs/_build
+
+# External Sources
+src
+
+# IPython
+.ipynb_checkpoints
+
+# gcc/fortran
+**/*.o
+**/*.a
+**/*.mod
+**/*.out
+
+workflows
+**/*.tif
+**/*.zip
+
+# project outputs
+*.bak
+pip-log.txt
+*.log
+output/**
 output/*.html
 output/*/index.html
-docs/_build
 .DS_Store
-*~
-.*.sw[po]
-.build
-.ve
-.env
-.cache
-.pytest
 .bootstrap
 .appveyor.token
-*.bak

.gitignore

@@ -1,55 +1,126 @@
-*.py[cod]
+# Installer
+#Makefile
+[Mm]akefile.config
+downloads
+
+# Docker
+#Dockerfile
+
+# Python / Extensions etc.
+*~
+*.mo
 *.so
+*.py[cod]
+*.bak
+*.sqlite
 *.egg
+*.egg[s]
 *.egg-info
-dist
+*egg[s]
+.installed.cfg
+.build
+.bootstrap
+.matplotlib
+__pycache__
+[Bb]in
 build
-downloads
-eggs
-.eggs
+dist
+develop-eggs
 parts
-bin
-var
 sdist
+var
 wheelhouse
-develop-eggs
-.installed.cfg
-lib
-lib64
-/data
-/src
-env/
-venv*/
-pyvenv*/
 pip-log.txt
+docs/_build
+
+# Unit test / Coverage reports
 *.log
+*.lock
+.cache
 .coverage
+.pytest
+.pytest_cache
+.pytest_cache/
 .tox
 .coverage.*
-.pytest_cache/
-nosetests.xml
 coverage.xml
+coverage
 htmlcov
-*.mo
-.mr.developer.cfg
+output/*.html
+output/*/index.html
+reports
+nosetests.xml
+unit_tests/testdata.json
+result[s].xml
+testdata.json
+
+# Environment
+env/
+venv*/
+pyvenv*/
+.ve
+.env
+
+# vscode
+.vscode
+
+# R
+*.Rhistory
+
+# Eclipse / PyDev
 .project
 .pydevproject
+.settings
+.mr.developer.cfg
+
+# PyCharm
+*.idea
 .idea
-.vscode
+
+# Intellij
 *.iml
+
+# Kate
+*.kate-swp
+
+# Sublime Text Editor
+*.sublime*
+
+# External Sources
+src
+lib
+lib64
+
+# IPython
+.ipynb_checkpoints
+
+# gcc/fortran
+*.o
+*.a
+*.mod
+*.out
+
+# snappy
+esa-snap_sentinel_unix_6_0.sh
+response.varfile
+
+# conda
+environment.yml
+
+# environment
+env
+venv
+
+# project sources
+demo
+# ignore both root data dir and root data symlink
+# but not lower level data dirs (ie: thelper.data)
+/data
+*.tif
+*.zip
+./workflow[s]
 *.komodoproject
-output/*.html
-output/*/index.html
-docs/_build
-.DS_Store
-*~
 .*.sw[po]
-.build
-.ve
-.env
-.cache
-.pytest
-.pytest_cache
-.bootstrap
+.DS_Store
 .appveyor.token
-*.bak
+00-LOGS

.travis.yml

@@ -7,6 +7,7 @@ python:
 sudo: false
 env:
   global:
+    - CONDA_HOME=$HOME/conda
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
     - SEGFAULT_SIGNALS=all
 before_install:
@@ -40,7 +41,8 @@ jobs:
         on:
           tags: true
       after_deploy:
-        - docker build -t ${DOCKER_REPO}:${TRAVIS_TAG} -t ${DOCKER_REPO}:latest .
+        - docker build -t ${DOCKER_REPO}:${TRAVIS_TAG} -t ${DOCKER_REPO}:latest -t thelper:base -f Dockerfile .
+        - docker build -t ${DOCKER_REPO}:${TRAVIS_TAG}-geo -t ${DOCKER_REPO}:latest-geo -t thelper:geo -f Dockerfile-geo .
         - docker run -t ${DOCKER_REPO}:latest thelper --version
         - travis_wait 50 docker push ${DOCKER_REPO}
     - stage: conda_deploy
@@ -59,3 +61,4 @@ jobs:
         - conda install conda-build conda-verify anaconda-client
         - conda info -a
         - travis_wait 50 conda build --token $CONDA_TOKEN --user $CONDA_USERNAME ci/
+