Commit cc4b7724 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Renamed project from 'GeoMultiSens' to 'gms_preprocessing'.


Former-commit-id: cd487679
parent 45c7de11
* GeoMultiSens version: * gms_preprocessing version:
* Python version: * Python version:
* Operating System: * Operating System:
......
...@@ -63,24 +63,23 @@ target/ ...@@ -63,24 +63,23 @@ target/
.python-version .python-version
/GeoMultiSens.py
.idea/ .idea/
BAK/ BAK/
OLD/ OLD/
tests/data/output_mgrs_tiles/ tests/data/output_mgrs_tiles/
tests/data/output_scenes/ tests/data/output_scenes/
tests/data/sampledata/ tests/data/sampledata/
geomultisens/database/metadata/ gms_preprocessing/database/metadata/
geomultisens/database/tiling_system/ gms_preprocessing/database/tiling_system/
geomultisens/database/processed_data/ gms_preprocessing/database/processed_data/
geomultisens/database/earth_sun_distance/horizon_web_interface.cgi_files/ gms_preprocessing/database/earth_sun_distance/horizon_web_interface.cgi_files/
geomultisens/database/earth_sun_distance/horizon_web_interface.cgi.html gms_preprocessing/database/earth_sun_distance/horizon_web_interface.cgi.html
geomultisens/database/earth_sun_distance/README gms_preprocessing/database/earth_sun_distance/README
geomultisens/database/solar_irradiance/Solar_irradiance_Thuillier_2002.xls gms_preprocessing/database/solar_irradiance/Solar_irradiance_Thuillier_2002.xls
geomultisens/database/solar_irradiance/Thuillier_2003_solar_irradiance_400_2400.pdf gms_preprocessing/database/solar_irradiance/Thuillier_2003_solar_irradiance_400_2400.pdf
geomultisens/database/solar_irradiance/SUNp1fontenla.asc gms_preprocessing/database/solar_irradiance/SUNp1fontenla.asc
geomultisens/database/solar_irradiance/SOLAR.txt gms_preprocessing/database/solar_irradiance/SOLAR.txt
geomultisens/logs/ gms_preprocessing/logs/
.ipynb_checkpoints/ .ipynb_checkpoints/
sandbox/meta_validation/ sandbox/meta_validation/
......
before_script: before_script:
- git lfs pull - git lfs pull
test_geomultisens: test_gms_preprocessing:
script: script:
- source /root/anaconda3/bin/activate - source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal - export GDAL_DATA=/root/anaconda3/share/gdal
...@@ -19,7 +19,7 @@ test_geomultisens: ...@@ -19,7 +19,7 @@ test_geomultisens:
pages: pages:
stage: deploy stage: deploy
dependencies: dependencies:
- test_geomultisens - test_gms_preprocessing
script: script:
- mkdir -p public/coverage - mkdir -p public/coverage
- cp -r htmlcov/* public/coverage/ - cp -r htmlcov/* public/coverage/
......
...@@ -28,5 +28,5 @@ deploy: ...@@ -28,5 +28,5 @@ deploy:
secure: PLEASE_REPLACE_ME secure: PLEASE_REPLACE_ME
on: on:
tags: true tags: true
repo: danschef/geomultisens repo: danschef/gms_preprocessing
condition: $TOXENV == py27 condition: $TOXENV == py27
...@@ -15,7 +15,7 @@ Types of Contributions ...@@ -15,7 +15,7 @@ Types of Contributions
Report Bugs Report Bugs
~~~~~~~~~~~ ~~~~~~~~~~~
Report bugs at https://gitext.gfz-potsdam.de/danschef/GeoMultiSens/issues. Report bugs at https://gitext.gfz-potsdam.de/danschef/gms_preprocessing/issues.
If you are reporting a bug, please include: If you are reporting a bug, please include:
...@@ -38,14 +38,14 @@ and "help wanted" is open to whoever wants to implement it. ...@@ -38,14 +38,14 @@ and "help wanted" is open to whoever wants to implement it.
Write Documentation Write Documentation
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
GeoMultiSens could always use more documentation, whether as part of the gms_preprocessing could always use more documentation, whether as part of the
official GeoMultiSens docs, in docstrings, or even on the web in blog posts, official gms_preprocessing docs, in docstrings, or even on the web in blog posts,
articles, and such. articles, and such.
Submit Feedback Submit Feedback
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
The best way to send feedback is to file an issue at https://gitext.gfz-potsdam.de/danschef/GeoMultiSens/issues. The best way to send feedback is to file an issue at https://gitext.gfz-potsdam.de/danschef/gms_preprocessing/issues.
If you are proposing a feature: If you are proposing a feature:
...@@ -57,17 +57,17 @@ If you are proposing a feature: ...@@ -57,17 +57,17 @@ If you are proposing a feature:
Get Started! Get Started!
------------ ------------
Ready to contribute? Here's how to set up `geomultisens` for local development. Ready to contribute? Here's how to set up `gms_preprocessing` for local development.
1. Fork the `geomultisens` repo on GitHub. 1. Fork the `gms_preprocessing` repo on GitHub.
2. Clone your fork locally:: 2. Clone your fork locally::
$ git clone https://gitext.gfz-potsdam.de/danschef/GeoMultiSens $ git clone https://gitext.gfz-potsdam.de/danschef/gms_preprocessing
3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development:: 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
$ mkvirtualenv geomultisens $ mkvirtualenv gms_preprocessing
$ cd geomultisens/ $ cd gms_preprocessing/
$ python setup.py develop $ python setup.py develop
4. Create a branch for local development:: 4. Create a branch for local development::
...@@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `geomultisens` for local development. ...@@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `geomultisens` for local development.
5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox:: 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
$ flake8 geomultisens tests $ flake8 gms_preprocessing tests
$ python setup.py test or py.test $ python setup.py test or py.test
$ tox $ tox
...@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines: ...@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
your new functionality into a function with a docstring, and add the your new functionality into a function with a docstring, and add the
feature to the list in README.rst. feature to the list in README.rst.
3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check 3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
https://travis-ci.org/danschef/geomultisens/pull_requests https://travis-ci.org/danschef/gms_preprocessing/pull_requests
and make sure that the tests pass for all supported Python versions. and make sure that the tests pass for all supported Python versions.
Tips Tips
...@@ -111,4 +111,4 @@ Tips ...@@ -111,4 +111,4 @@ Tips
To run a subset of tests:: To run a subset of tests::
$ python -m unittest tests.test_geomultisens $ python -m unittest tests.test_gms_preprocessing
...@@ -68,7 +68,7 @@ Fixes and improvements: ...@@ -68,7 +68,7 @@ Fixes and improvements:
* processing.pipeline: refactored 'exec__...' to 'exec_...' * processing.pipeline: refactored 'exec__...' to 'exec_...'
* tests.test_geomultisens: removed superfluous paths configs * tests.test_gms_preprocessing: removed superfluous paths configs
* removed cloud_classifiers from .gitignore * removed cloud_classifiers from .gitignore
......
...@@ -50,7 +50,7 @@ clean-test: ## remove test and coverage artifacts ...@@ -50,7 +50,7 @@ clean-test: ## remove test and coverage artifacts
rm -fr nosetests.xml rm -fr nosetests.xml
lint: ## check style with flake8 lint: ## check style with flake8
flake8 geomultisens tests flake8 gms_preprocessing tests
test: ## run tests quickly with the default Python test: ## run tests quickly with the default Python
python setup.py test python setup.py test
...@@ -59,7 +59,7 @@ test-all: ## run tests on every Python version with tox ...@@ -59,7 +59,7 @@ test-all: ## run tests on every Python version with tox
tox tox
coverage: clean-test ## check code coverage quickly with the default Python coverage: clean-test ## check code coverage quickly with the default Python
coverage run --source geomultisens setup.py test coverage run --source gms_preprocessing setup.py test
coverage combine # must be called in order to make coverage work in multiprocessing coverage combine # must be called in order to make coverage work in multiprocessing
coverage report -m coverage report -m
coverage html coverage html
...@@ -69,13 +69,13 @@ nosetests: clean-test ## Runs nosetests with coverage, xUnit and nose-html-outpu ...@@ -69,13 +69,13 @@ nosetests: clean-test ## Runs nosetests with coverage, xUnit and nose-html-outpu
## - puts the coverage results in the folder 'htmlcov' ## - puts the coverage results in the folder 'htmlcov'
## - generates 'nosetests.html' (--with-html) ## - generates 'nosetests.html' (--with-html)
## - generates 'nosetests.xml' (--with-xunit) which is currently not visualizable by GitLab ## - generates 'nosetests.xml' (--with-xunit) which is currently not visualizable by GitLab
nosetests -vv --with-coverage --cover-package=geomultisens --cover-erase --cover-html --cover-html-dir=htmlcov \ nosetests -vv --with-coverage --cover-package=gms_preprocessing --cover-erase --cover-html --cover-html-dir=htmlcov \
--with-html --with-xunit --rednose --force-color --with-html --with-xunit --rednose --force-color
docs: ## generate Sphinx HTML documentation, including API docs docs: ## generate Sphinx HTML documentation, including API docs
rm -f docs/geomultisens.rst rm -f docs/gms_preprocessing.rst
rm -f docs/modules.rst rm -f docs/modules.rst
sphinx-apidoc -o docs/ geomultisens sphinx-apidoc -o docs/ gms_preprocessing
$(MAKE) -C docs clean $(MAKE) -C docs clean
$(MAKE) -C docs html $(MAKE) -C docs html
#$(BROWSER) docs/_build/html/index.html #$(BROWSER) docs/_build/html/index.html
......
============ =================
GeoMultiSens gms_preprocessing
============ =================
GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data
* Free software: GNU General Public License v3 * Free software: GNU General Public License v3
* Documentation: http://danschef.gitext.gfz-potsdam.de/GeoMultiSens/doc/ * Documentation: http://danschef.gitext.gfz-potsdam.de/gms_preprocessing/doc/
Status Status
------ ------
.. .. image:: https://img.shields.io/pypi/v/geomultisens.svg .. .. image:: https://img.shields.io/pypi/v/gms_preprocessing.svg
:target: https://pypi.python.org/pypi/geomultisens :target: https://pypi.python.org/pypi/gms_preprocessing
.. .. image:: https://img.shields.io/travis/danschef/geomultisens.svg .. .. image:: https://img.shields.io/travis/danschef/gms_preprocessing.svg
:target: https://travis-ci.org/danschef/geomultisens :target: https://travis-ci.org/danschef/gms_preprocessing
.. .. image:: https://readthedocs.org/projects/geomultisens/badge/?version=latest .. .. image:: https://readthedocs.org/projects/gms_preprocessing/badge/?version=latest
:target: https://geomultisens.readthedocs.io/en/latest/?badge=latest :target: https://gms_preprocessing.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status :alt: Documentation Status
.. .. image:: https://pyup.io/repos/github/danschef/geomultisens/shield.svg .. .. image:: https://pyup.io/repos/github/danschef/gms_preprocessing/shield.svg
:target: https://pyup.io/repos/github/danschef/geomultisens/ :target: https://pyup.io/repos/github/danschef/gms_preprocessing/
:alt: Updates :alt: Updates
.. image:: https://gitext.gfz-potsdam.de/danschef/GeoMultiSens/badges/master/build.svg .. image:: https://gitext.gfz-potsdam.de/danschef/gms_preprocessing/badges/master/build.svg
:target: https://gitext.gfz-potsdam.de/danschef/GeoMultiSens/commits/master :target: https://gitext.gfz-potsdam.de/danschef/gms_preprocessing/commits/master
.. image:: https://gitext.gfz-potsdam.de/danschef/GeoMultiSens/badges/master/coverage.svg .. image:: https://gitext.gfz-potsdam.de/danschef/gms_preprocessing/badges/master/coverage.svg
:target: http://danschef.gitext.gfz-potsdam.de/GeoMultiSens/coverage/ :target: http://danschef.gitext.gfz-potsdam.de/gms_preprocessing/coverage/
See also the latest coverage_ report and the nosetests_ HTML report. See also the latest coverage_ report and the nosetests_ HTML report.
...@@ -43,20 +43,42 @@ Features ...@@ -43,20 +43,42 @@ Features
Installation Installation
------------ ------------
Clone the following repository and install GeoMultiSens to your local python: gms_preprocessing depends on some open source packages which are usually installed without problems by the automatic install
routine. However, for some projects, we strongly recommend resolving the dependency before the automatic installer
is run. This approach avoids problems with conflicting versions of the same software.
Using conda_, the recommended approach is:
.. code-block:: console
# create virtual environment for arosics, this is optional
conda create -y -q --name arosics python=3
source activate arosics
conda install -y -q -c anaconda hdf5 pytables; \
conda install -y -q -c conda-forge gdal pygrib h5py; \
conda install -y -q -c numba llvmlite; \
conda install -y -q -c conda-forge psycopg2 "
Then install sicor:
.. code-block:: console
git clone https://gitext.gfz-potsdam.de:EnMAP/sicor.git
cd sicor; make install
Clone the following repository and install gms_preprocessing to your local python:
.. code-block:: console .. code-block:: console
git clone https://gitext.gfz-potsdam.de:danschef/GeoMultiSens.git git clone https://gitext.gfz-potsdam.de:danschef/gms_preprocessing.git
cd GeoMultiSens; make install cd gms_preprocessing; make install
.. .. The pip installer does not work as long as the packages arosics, geoarray, py_tools_ds and sicor are not public. .. .. The pip installer does not work as long as the packages arosics, geoarray, py_tools_ds and sicor are not public.
.. .. * Use the pip-Installer: .. .. * Use the pip-Installer:
.. .. pip install git+https://gitext.gfz-potsdam.de/danschef/GeoMultiSens.git # for HTTPS authentification .. .. pip install git+https://gitext.gfz-potsdam.de/danschef/gms_preprocessing.git # for HTTPS authentification
.. .. pip install git+git@gitext.gfz-potsdam.de:danschef/GeoMultiSens.git # for SSH-Key authentification .. .. pip install git+git@gitext.gfz-potsdam.de:danschef/gms_preprocessing.git # for SSH-Key authentification
Credits Credits
...@@ -66,5 +88,6 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack ...@@ -66,5 +88,6 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack
.. _Cookiecutter: https://github.com/audreyr/cookiecutter .. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
.. _coverage: http://danschef.gitext.gfz-potsdam.de/GeoMultiSens/coverage/ .. _coverage: http://danschef.gitext.gfz-potsdam.de/gms_preprocessing/coverage/
.. _nosetests: http://danschef.gitext.gfz-potsdam.de/GeoMultiSens/nosetests_reports/nosetests.html .. _nosetests: http://danschef.gitext.gfz-potsdam.de/gms_preprocessing/nosetests_reports/nosetests.html
.. _conda: https://conda.io/docs/
...@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH} ...@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH}
export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here! export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here!
export GDAL_DATA=${PFX}/opt/share/gdal export GDAL_DATA=${PFX}/opt/share/gdal
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/GeoMultiSens # needed to find geomultisens export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/gms_preprocessing # needed to find gms_preprocessing
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/geoarray # needed to find geoarray export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/geoarray # needed to find geoarray
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/py_tools_ds # needed to find py_tools_ds export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/py_tools_ds # needed to find py_tools_ds
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/arosics # needed to find e.g. AROSICS export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python/arosics # needed to find e.g. AROSICS
......
...@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH} ...@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH}
export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here! export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here!
export GDAL_DATA=${PFX}/opt/share/gdal export GDAL_DATA=${PFX}/opt/share/gdal
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/GeoMultiSens # needed to find geomultisens export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/gms_preprocessing # needed to find gms_preprocessing
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/geoarray # needed to find geoarray export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/geoarray # needed to find geoarray
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/py_tools_ds # needed to find py_tools_ds export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/py_tools_ds # needed to find py_tools_ds
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/arosics # needed to find e.g. AROSICS export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/arosics # needed to find e.g. AROSICS
......
...@@ -9,8 +9,8 @@ import matplotlib ...@@ -9,8 +9,8 @@ import matplotlib
matplotlib.use('Agg', warn=False) # switch matplotlib backend to 'Agg' and disable warning in case its already 'Agg' matplotlib.use('Agg', warn=False) # switch matplotlib backend to 'Agg' and disable warning in case its already 'Agg'
from geomultisens import process_controller, __version__ from gms_preprocessing import process_controller, __version__
from geomultisens.misc.database_tools import GMS_JOB from gms_preprocessing.misc.database_tools import GMS_JOB
def run_from_jobid(args): def run_from_jobid(args):
...@@ -124,13 +124,13 @@ def _run_job(dbJob, parallelization_level='scenes'): ...@@ -124,13 +124,13 @@ def _run_job(dbJob, parallelization_level='scenes'):
def get_gms_argparser(): def get_gms_argparser():
"""Return argument parser for run_gms.py program.""" """Return argument parser for run_gms.py program."""
### CONFIGURE MAIN PARSER FOR GeoMultiSens ### CONFIGURE MAIN PARSER FOR THE GEOMULTISENS PREPROCESSING CHAIN
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
prog='run_gms.py', prog='run_gms.py',
description='='*70+'\n'+'GeoMultiSens console argument parser. ' \ description='='*70+'\n'+'GeoMultiSens preprocessing console argument parser. ' \
'Python implementation by Daniel Scheffler (daniel.scheffler@gfz-potsdam.de)', 'Python implementation by Daniel Scheffler (daniel.scheffler@gfz-potsdam.de)',
epilog="The argument parser offers multiple sub-argument parsers (jobid, sceneids, ...) for starting GMS jobs. " epilog="The argument parser offers multiple sub-argument parsers (jobid, sceneids, ...) for starting GMS jobs. "
"use '>>> python /path/to/GeMultiSens/run_gms.py <sub-parser> -h' for detailed documentation and usage " "use '>>> python /path/to/gms_preprocessing/run_gms.py <sub-parser> -h' for detailed documentation and usage "
"hints.") "hints.")
parser.add_argument('--version', action='version', version=__version__) parser.add_argument('--version', action='version', version=__version__)
...@@ -138,37 +138,36 @@ def get_gms_argparser(): ...@@ -138,37 +138,36 @@ def get_gms_argparser():
subparsers = parser.add_subparsers() subparsers = parser.add_subparsers()
### CONFIGURE SUBPARSERS FOR GeoMultiSens ### CONFIGURE SUBPARSERS FOR THE GEOMULTISENS PREPROCESSING CHAIN
parser_jobid = subparsers.add_parser('jobid', parser_jobid = subparsers.add_parser('jobid',
description= 'Run a GeoMultiSens job using an already existing job ID.', description= 'Run a GeoMultiSens preprocessing job using an already existing job ID.',
help="Run a GeoMultiSens job using an already existing job ID (Sub-Parser).") help="Run a GeoMultiSens preprocessing job using an already existing job ID (Sub-Parser).")
parser_sceneids = subparsers.add_parser('sceneids', parser_sceneids = subparsers.add_parser('sceneids',
description='Run a GeoMultiSens job for a given list of scene IDs.', description='Run a GeoMultiSens preprocessing job for a given list of scene IDs.',
help="Run a GeoMultiSens job for a given list of scene IDs (Sub-Parser).") help="Run a GeoMultiSens preprocessing job for a given list of scene IDs (Sub-Parser).")
parser_entityids = subparsers.add_parser('entityids', parser_entityids = subparsers.add_parser('entityids',
description='Run a GeoMultiSens job for a given list of entity IDs.', description='Run a GeoMultiSens preprocessing job for a given list of entity IDs.',
help="Run a GeoMultiSens job for a given list of entity IDs (Sub-Parser).") help="Run a GeoMultiSens preprocessing job for a given list of entity IDs (Sub-Parser).")
parser_filenames = subparsers.add_parser('filenames', parser_filenames = subparsers.add_parser('filenames',
description='Run a GeoMultiSens job for a given list of filenames of downloaded satellite image archives!', description='Run a GeoMultiSens preprocessing job for a given list of filenames of downloaded satellite image archives!',
help="Run a GeoMultiSens job for a given list of filenames of downloaded satellite image archives! (Sub-Parser).") help="Run a GeoMultiSens preprocessing job for a given list of filenames of downloaded satellite image archives! (Sub-Parser).")
parser_constraints = subparsers.add_parser('constraints', parser_constraints = subparsers.add_parser('constraints',
description='Run a GeoMultiSens job matching the given constraints.', description='Run a GeoMultiSens preprocessing job matching the given constraints.',
help="Run a GeoMultiSens job matching the given constraints (Sub-Parser).") help="Run a GeoMultiSens preprocessing job matching the given constraints (Sub-Parser).")
#parse_from_sceneids = subparsers.add_parser('from_sceneids', #parse_from_sceneids = subparsers.add_parser('from_sceneids',
# description='Run a GeoMultiSens job for a given list of scene IDs.', # description='Run a GeoMultiSens preprocessing job for a given list of scene IDs.',
# help="use '>>> python /path/to/GeMultiSens/run_gms.py from_sceneids -h' for documentation and usage hints") # help="use '>>> python /path/to/GeMultiSens/run_gms.py from_sceneids -h' for documentation and usage hints")
## ADD ARGUMENTS ## ADD ARGUMENTS
# add arguments to parser_jobid # add arguments to parser_jobid
jid_p = parser_jobid.add_argument jid_p = parser_jobid.add_argument
jid_p('jobid', type=int, jid_p('jobid', type=int, help='job ID of an already created GeoMultiSens preprocessing job (must be present in the jobs table of the database)')
help='job ID of an already created GeoMultiSens job (must be present in the jobs table of the database)')
# add arguments to parser_sceneids # add arguments to parser_sceneids
sid_p = parser_sceneids.add_argument sid_p = parser_sceneids.add_argument
......
...@@ -85,17 +85,17 @@ qthelp: ...@@ -85,17 +85,17 @@ qthelp:
@echo @echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:" ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/geomultisens.qhcp" @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/gms_preprocessing.qhcp"
@echo "To view the help file:" @echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/geomultisens.qhc" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/gms_preprocessing.qhc"
devhelp: devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo @echo
@echo "Build finished." @echo "Build finished."
@echo "To view the help file:" @echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/geomultisens" @echo "# mkdir -p $$HOME/.local/share/devhelp/gms_preprocessing"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/geomultisens" @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/gms_preprocessing"
@echo "# devhelp" @echo "# devhelp"
epub: epub:
......
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# geomultisens documentation build configuration file, created by # gms_preprocessing documentation build configuration file, created by
# sphinx-quickstart on Tue Jul 9 22:26:36 2013. # sphinx-quickstart on Tue Jul 9 22:26:36 2013.
# #
# This file is execfile()d with the current directory set to its # This file is execfile()d with the current directory set to its
...@@ -31,7 +31,7 @@ project_root = os.path.dirname(cwd) ...@@ -31,7 +31,7 @@ project_root = os.path.dirname(cwd)
# version is used. # version is used.
sys.path.insert(0, project_root) sys.path.insert(0, project_root)
import geomultisens import gms_preprocessing
# -- General configuration --------------------------------------------- # -- General configuration ---------------------------------------------
...@@ -55,7 +55,7 @@ source_suffix = '.rst' ...@@ -55,7 +55,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'GeoMultiSens' project = u'gms_preprocessing'
copyright = u"2017, Daniel Scheffler" copyright = u"2017, Daniel Scheffler"
# The version info for the project you're documenting, acts as replacement # The version info for the project you're documenting, acts as replacement
...@@ -63,9 +63,9 @@ copyright = u"2017, Daniel Scheffler" ...@@ -63,9 +63,9 @@ copyright = u"2017, Daniel Scheffler"
# the built documents. # the built documents.
# #
# The short X.Y version. # The short X.Y version.
version = geomultisens.__version__ version = gms_preprocessing.__version__
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = geomultisens.__version__ release = gms_preprocessing.__version__
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
...@@ -188,7 +188,7 @@ html_static_path = ['_static'] ...@@ -188,7 +188,7 @@ html_static_path = ['_static']
#html_file_suffix = None #html_file_suffix = None
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'geomultisensdoc' htmlhelp_basename = 'gms_preprocessingdoc'
# -- Options for LaTeX output ------------------------------------------ # -- Options for LaTeX output ------------------------------------------
...@@ -208,8 +208,8 @@ latex_elements = { ...@@ -208,8 +208,8 @@ latex_elements = {