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

Fixed pages. Updated version info.

parent 66836eda
Pipeline #1334 passed with stages
in 3 minutes and 36 seconds
...@@ -57,15 +57,19 @@ test_arosics_install: ...@@ -57,15 +57,19 @@ test_arosics_install:
- source activate arosics - source activate arosics
# resolve some requirements with conda # resolve some requirements with conda
- conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely - conda install --yes -q -c conda-forge numpy gdal scikit-image matplotlib pyproj rasterio shapely
# run installer
- python setup.py install - python setup.py install
# test if its importable
- cd .. - cd ..
- pwd - pwd
- ls - ls
- python -c "import arosics; print(arosics)" - python -c "import arosics; print(arosics)"
- python -c "from arosics import COREG, COREG_LOCAL" - python -c "from arosics import COREG, COREG_LOCAL"
only:
- master
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_arosics - test_arosics
...@@ -74,10 +78,12 @@ deploy_pages: ...@@ -74,10 +78,12 @@ deploy_pages:
- rm -rf public - rm -rf public
- mkdir public - mkdir public
- mkdir -p public/doc - mkdir -p public/doc
- mkdir -p public/images/
- mkdir -p public/coverage - mkdir -p public/coverage
- mkdir -p public/nosetests_reports - mkdir -p public/nosetests_reports
# Copy over the docs # Copy over the docs
- 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 # Copy over the coverage reports
- cp -r htmlcov/* public/coverage/ - cp -r htmlcov/* public/coverage/
# Copy over the nosetests reports # Copy over the nosetests reports
...@@ -85,6 +91,8 @@ deploy_pages: ...@@ -85,6 +91,8 @@ deploy_pages:
# Check if everything is working great # Check if everything is working great
- ls -al public - ls -al public
- ls -al public/doc - ls -al public/doc
- ls -al public/coverage
- ls -al public/nosetests_reports
artifacts: artifacts:
paths: paths:
- public - public
......
...@@ -12,8 +12,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid ...@@ -12,8 +12,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid
__author__ = """Daniel Scheffler""" __author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de' __email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.6.1' __version__ = '0.6.2'
__versionalias__ = '2017-10-10_02' __versionalias__ = '2017-10-10_03'
__all__ = ['COREG', __all__ = ['COREG',
'COREG_LOCAL', 'COREG_LOCAL',
'DESHIFTER', 'DESHIFTER',
......
...@@ -28,7 +28,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn ...@@ -28,7 +28,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn
setup( setup(
name='arosics', name='arosics',
version='0.6.1', version='0.6.2',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data", description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history, long_description=readme + '\n\n' + history,
author="Daniel Scheffler", 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