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

Fix for issue #11; updated run-scripts, updated package dependencies.

updated __version__
updated __versionalias__


Former-commit-id: cb7d5b1f
parent 22e18a7b
......@@ -31,7 +31,7 @@ Features
* TODO
Credits
---------
-------
This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
......
......@@ -15,6 +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 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/geoarray # needed to find geoarray
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python # needed to find e.g. CoReg_Sat, py_tools_ds
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/hollstein/python/AT4P # needed to find AT4P
......
......@@ -15,6 +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 GDAL_DATA=${PFX}/opt/share/gdal
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/GeoMultiSens_deployed/GeoMultiSens # needed to find geomultisens
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/GeoMultiSens_deployed/geoarray # needed to find geoarray
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/GeoMultiSens_deployed # needed to find e.g. CoReg_Sat, py_tools_ds
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/hollstein/python/AT4P # needed to find AT4P
......@@ -25,6 +26,6 @@ export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/hollstein/python/cBc # needed to f
# execute python script
#ipython --colors='NoColor' run_gms.py jobid "$@" # NoColor must be active because gwt-log cannot interpret ANSI console colors
#ipython --colors='NoColor' run_gms.py jobid "$@" # NoColor must be active for ipython because gwt-log cannot interpret ANSI console colors
python run_gms.py jobid "$@"
#python scenes_jobs_dbaccess.py "$@"
......@@ -2,8 +2,8 @@
__author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.1.0'
__versionalias__ = '20170523.04'
__version__ = '0.1.1'
__versionalias__ = '20170524.01'
from . import algorithms
......
......@@ -1056,7 +1056,8 @@ def delete_processing_results(scene_ID, proc_level='all', force=False):
try:
os.remove(F)
except OSError as e:
errors = True
if not os.path.basename(F).startswith('.fuse_hidden'):
errors = True
if errors:
raise OSError('Not all files deleted properly.')
......
......@@ -10,7 +10,7 @@ with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = [
'matplotlib', 'numpy', 'sklearn', 'scipy', 'gdal', 'osr', 'pyproj', 'osr', 'shapely', 'ephem', 'pyorbital', 'dill',
'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'pyephem', 'pyorbital', 'dill',
'pandas', 'numba', 'spectral', 'pyhdf', 'geopandas', 'iso8601',
]
......@@ -20,7 +20,7 @@ test_requirements = [
setup(
name='geomultisens',
version='0.1.0',
version='0.1.1',
description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment