Commit 12716f44 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Removed deprecated PyPI upload code from .gitlab-ci.yml. Replaced relative...


Removed deprecated PyPI upload code from .gitlab-ci.yml. Replaced relative links in README.rst by absolute ones. Updated version info.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 46735a82
Pipeline #4377 passed with stages
in 5 minutes and 10 seconds
...@@ -4,12 +4,6 @@ before_script: ...@@ -4,12 +4,6 @@ before_script:
- cp -r docs/images/* public/images/ - cp -r docs/images/* public/images/
# Advise GitLab that these environment vars should be loaded from the Variables config.
variables:
PYPI_USER: SECURE
PYPI_PASSWORD: SECURE
stages: stages:
- test - test
- deploy - deploy
...@@ -113,28 +107,13 @@ deploy_pypi: ...@@ -113,28 +107,13 @@ deploy_pypi:
stage: deploy stage: deploy
dependencies: dependencies:
- test_arosics - test_arosics
script: # Configure the PyPI credentials, then push the package, and cleanup the creds. script:
- source /root/miniconda3/bin/activate - source /root/miniconda3/bin/activate
- source activate ci_env - source activate ci_env
- mkdir -p public/images/
- cp -r docs/images/* public/images/
# - printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
# - printf "[pypi]\n""repository:"" https://upload.pypi.org/legacy/\n" >> ~/.pypirc
# - printf "username= ${PYPI_USER}\n" >> ~/.pypirc
# - printf "password= ${PYPI_PASSWORD}\n" >> ~/.pypirc
# - python setup.py check sdist upload -r pypi # This will fail if your creds are bad.
# - echo "" > ~/.pypirc && rm ~/.pypirc # If the above fails, this won't run.
- pip install -U twine - pip install -U twine
- python setup.py sdist - python setup.py sdist
- twine upload dist/* - twine upload dist/* # requires creds as environment variables
only: only:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags) - /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except: except:
- dev - dev
cleanup_pypirc:
stage: cleanup
when: always # this is important; run even if preceding stages failed.
script:
- rm -vf ~/.pypirc # we don't want to leave these around, but GitLab may clean up anyway.
...@@ -73,7 +73,8 @@ also allows to align the output image to the reference image coordinate grid if ...@@ -73,7 +73,8 @@ also allows to align the output image to the reference image coordinate grid if
Here is an example of a Landsat-8 / Sentinel-2 image pair before and after co-registration using AROSICS: Here is an example of a Landsat-8 / Sentinel-2 image pair before and after co-registration using AROSICS:
.. image:: docs/images/animation_testcase1_zoom_L8_S2_global_coreg_before_after_900x456.gif .. image:: https://gitext.gfz-potsdam.de/danschef/arosics/raw/master/docs/images/
animation_testcase1_zoom_L8_S2_global_coreg_before_after_900x456.gif
Local co-registration - for spatially variable shifts but a bit slower Local co-registration - for spatially variable shifts but a bit slower
...@@ -87,7 +88,7 @@ affine transformation. Warping of the target image is done using an appropriate ...@@ -87,7 +88,7 @@ affine transformation. Warping of the target image is done using an appropriate
Here is an example of the computed shift vectors after filtering false-positives Here is an example of the computed shift vectors after filtering false-positives
(mainly due to clouds in the target image): (mainly due to clouds in the target image):
.. image:: docs/images/shift_vectors_testcase1__900x824.gif .. image:: https://gitext.gfz-potsdam.de/danschef/arosics/raw/master/docs/images/shift_vectors_testcase1__900x824.gif
For further details check out the `documentation <http://danschef.gitext.gfz-potsdam.de/arosics/doc/>`__! For further details check out the `documentation <http://danschef.gitext.gfz-potsdam.de/arosics/doc/>`__!
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.9.1' __version__ = '0.9.2'
__versionalias__ = '2019-08-25_02' __versionalias__ = '2019-08-25_03'
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