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

Fixed GitLab Pages. Updated minimal versions of dependencies. Updated docker...

Fixed GitLab Pages. Updated minimal versions of dependencies. Updated docker runner tag. Updated version info.


Former-commit-id: e01f4eef
parent 21c76257
Pipeline #2000 failed with stage
in 26 seconds
...@@ -40,7 +40,6 @@ test_styles: ...@@ -40,7 +40,6 @@ test_styles:
- source /root/anaconda3/bin/activate - source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal - export GDAL_DATA=/root/anaconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later - export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- pip install flake8 pycodestyle pylint pydocstyle # TODO remove as soon as docker container is rebuilt
- make lint - make lint
artifacts: artifacts:
paths: paths:
...@@ -50,23 +49,33 @@ test_styles: ...@@ -50,23 +49,33 @@ test_styles:
when: always when: always
deploy_pages: pages: # this job must be called 'pages' to advise GitLab to upload content to GitLab Pages
stage: deploy stage: deploy
dependencies: dependencies:
- test_gms_preprocessing - test_gms_preprocessing
script: script:
# Create the public directory
- rm -rf public
- mkdir public
- mkdir -p public/doc
- mkdir -p public/images/
- mkdir -p public/coverage - mkdir -p public/coverage
- cp -r htmlcov/* public/coverage/
- mkdir -p public/nosetests_reports - mkdir -p public/nosetests_reports
- cp nosetests.* public/nosetests_reports/ # Copy over the docs
- mkdir -p public/doc
- cp -r docs/_build/html/* public/doc/ - cp -r docs/_build/html/* public/doc/
- cp -r docs/images/* public/images/
# Copy over the coverage reports
- cp -r htmlcov/* public/coverage/
# Copy over the nosetests reports
- cp nosetests.* public/nosetests_reports/
# Check if everything is working great
- ls -al public
- ls -al public/doc
- ls -al public/coverage
- ls -al public/nosetests_reports
artifacts: artifacts:
paths: paths:
- public - public
expire_in: 30 days expire_in: 30 days
environment:
name: production/pages
url: http://geomultisens.gitext.gfz-potsdam.de/gms_preprocessing/
only: only:
- master - master
...@@ -13,8 +13,8 @@ from .processing.process_controller import process_controller # noqa: E402 ...@@ -13,8 +13,8 @@ from .processing.process_controller import process_controller # noqa: E402
__author__ = """Daniel Scheffler""" __author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de' __email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.8.4' __version__ = '0.8.5'
__versionalias__ = '20171005.01' __versionalias__ = '20171010.01'
__all__ = ['algorithms', __all__ = ['algorithms',
'io', 'io',
'misc', 'misc',
......
py_tools_ds py_tools_ds>=0.9.1
geoarray geoarray>=0.6.12
arosics arosics>0.6.2
git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git
matplotlib matplotlib
numpy numpy
......
...@@ -13,7 +13,7 @@ with open('HISTORY.rst') as history_file: ...@@ -13,7 +13,7 @@ with open('HISTORY.rst') as history_file:
requirements = [ requirements = [
'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz', 'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz',
'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy', 'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy',
'psycopg2', 'py_tools_ds', 'geoarray', 'arosics', 'six' 'psycopg2', 'py_tools_ds>=0.9.1', 'geoarray>=0.6.12', 'arosics>0.6.2', 'six'
# spectral<0.16 has some problems with writing signed integer 8bit data # spectral<0.16 has some problems with writing signed integer 8bit data
# fmask # conda install -c conda-forge python-fmask # fmask # conda install -c conda-forge python-fmask
# 'pyhdf', # conda install --yes -c conda-forge pyhdf # 'pyhdf', # conda install --yes -c conda-forge pyhdf
...@@ -24,7 +24,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn ...@@ -24,7 +24,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn
setup( setup(
name='gms_preprocessing', name='gms_preprocessing',
version='0.8.4', version='0.8.5',
description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data", description="GeoMultiSens - Scalable Multi-Sensor Analysis of Remote Sensing Data",
long_description=readme + '\n\n' + history, long_description=readme + '\n\n' + history,
author="Daniel Scheffler", author="Daniel Scheffler",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
context_dir="./context" context_dir="./context"
dockerfile="gms_preprocessing_ci.docker" dockerfile="gms_preprocessing_ci.docker"
tag="gms_preprocessing_ci:0.7.0" tag="gms_preprocessing_ci:0.8.4"
gitlab_runner="gms_preprocessing_gitlab_CI_runner" gitlab_runner="gms_preprocessing_gitlab_CI_runner"
# get sicor project # TODO move this to setup.py as soon as package is public # get sicor project # TODO move this to setup.py as soon as package is public
......
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