Merge branch 'master' into enhancement/adapt_ac_processor_to_sicor_dev

# Conflicts: # .gitlab-ci.yml # HISTORY.rst

Merge branch 'master' into enhancement/adapt_ac_processor_to_sicor_dev
# Conflicts: # .gitlab-ci.yml # HISTORY.rst
c378e3f8 · Daniel Scheffler · 4ffc8b2c · c1418ee6 · c378e3f8 · c378e3f8
Commit c378e3f8 authored Feb 11, 2021 by Daniel Scheffler
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,29 +13,29 @@ test_enpt:
    - source /root/miniconda3/bin/activate ci_env

    # update geoarray and py_tools_ds
-    - pip install 'geoarray>=0.8.11'
-    - pip install 'py_tools_ds>=0.14.23'
+    # - pip install 'geoarray>=0.8.11'
+    # - pip install 'py_tools_ds>=0.14.23'

    # install sicor and perhaps switch sicor branch
-    - mkdir /tmp/sicor_tables
-    - mv /tmp/sicor/sicor/tables/*.h5 /tmp/sicor_tables
-    - mv /tmp/sicor/sicor/tables/EnMAP_LUT* /tmp/sicor_tables
+    # - mkdir /tmp/sicor_tables
+    # - mv /tmp/sicor/sicor/tables/*.h5 /tmp/sicor_tables
+    # - mv /tmp/sicor/sicor/tables/EnMAP_LUT* /tmp/sicor_tables
    - rm -rf /tmp/sicor
-#    - git clone https://gitext.gfz-potsdam.de/EnMAP/sicor.git /tmp/sicor
-    - git clone -b dev https://gitext.gfz-potsdam.de/EnMAP/sicor.git /tmp/sicor  # FIXME use master as soon as its merged
-    - mv /tmp/sicor_tables/* /tmp/sicor/sicor/tables
-    - rm -rf /tmp/sicor_tables/
+    # - git clone https://git.gfz-potsdam.de/EnMAP/sicor.git /tmp/sicor
+    - git clone -b dev https://git.gfz-potsdam.de/EnMAP/sicor.git /tmp/sicor  # FIXME use master as soon as its merged
+    # - mv /tmp/sicor_tables/* /tmp/sicor/sicor/tables
+    # - rm -rf /tmp/sicor_tables/
    - pip install -e /tmp/sicor

    # update sicor
    # - rm -rf context/sicor
-    # - git clone https://gitext.gfz-potsdam.de/EnMAP/sicor.git ./context/sicor
+    # - git clone https://git.gfz-potsdam.de/EnMAP/sicor.git ./context/sicor
    # - cd ./context/sicor
    # - make download-tables
    # - python setup.py install
    # - cd ../../
-    - conda install -c conda-forge pygrib  # FIXME remove as soon as docker container is rebuilt
-    - pip install -U sicor
+    # - conda install -c conda-forge pygrib  # FIXME remove as soon as docker container is rebuilt
+    # - pip install -U sicor

    # run nosetests
    - make nosetests  # test are called here
@@ -67,6 +67,15 @@ test_styles:
    when: always


+test_urls:
+  stage: test
+  script:
+    - source /root/miniconda3/bin/activate ci_env
+    - pip install -U urlchecker
+    - make urlcheck
+  when: always
+
+
 test_enpt_install:
  stage: test
  script:

--- a/.zenodo.json
+++ b/.zenodo.json
@@ -67,19 +67,19 @@
    "related_identifiers": [
        {
            "scheme": "url",
-            "identifier": "https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT",
+            "identifier": "https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT",
            "relation": "isSupplementTo",
            "resource_type": "software"
        },
        {
            "scheme": "url",
-            "identifier": "https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc",
+            "identifier": "https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc",
            "relation": "isDocumentedBy",
            "resource_type": "publication-softwaredocumentation"
        },
        {
            "scheme": "url",
-            "identifier": "http://www.enmap.org/enmapbox.html",
+            "identifier": "https://www.enmap.org/data_tools/enmapbox/",
            "relation": "isPartOf"
        }
    ],

--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -15,7 +15,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~

-Report bugs at https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/issues
+Report bugs at https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/issues

 If you are reporting a bug, please include:

@@ -45,7 +45,7 @@ articles, and such.
 Submit Feedback
 ~~~~~~~~~~~~~~~

-The best way to send feedback is to file an issue at https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/issues
+The best way to send feedback is to file an issue at https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/issues

 If you are proposing a feature:

@@ -64,7 +64,7 @@ Ready to contribute? Here's how to set up `enpt` for local development.
 1. Fork the `enpt` repo on GitLab.
 2. Clone your fork locally::

-    $ git clone git@gitext.gfz-potsdam.de:your_name_here/enpt.git
+    $ git clone git@git.gfz-potsdam.de:your_name_here/enpt.git

 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up
   your fork for local development::
@@ -153,7 +153,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
   feature to the list in README.rst.
 3. The merge request should work for Python 2.6, 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8. Check
-   https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/merge_requests
+   https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/merge_requests
   and make sure that the tests pass for all supported Python versions.

 Tips

--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,11 +5,22 @@ History
 0.17.0 (coming soon)
 --------------------

+* Moved sicor download from build_enpt_testsuite_image.sh to new before_script.sh
+  and adjusted 'make gitlab_CI_docker' accordingly.
+* Fixed wrong package name in environment_enpt.yml.
+* Added sicor as conda environment to environment_enpt.yml which also makes before_script.sh obsolete.
+* Coverage files are now completely deleted by running 'make clean-test'.
 * Implemented new methods to transform raster arrays between sensor and map geometry.
 * VNIR_SWIR_SensorGeometryTransformer now also allows to transform entire 3D data arrays.
 * Added test_images_sensorgeo.py


+0.16.4 (2020-12-10)
+-------------------
+
+* Added URL checker CI job and fixed all dead URLs.
+
+
 0.16.3 (2020-11-03)
 -------------------


--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ clean-test: ## remove test and coverage artifacts
 	## don't call coverage erase here because make install calls make clean which calls make clean-test
 	## -> since make install should run without the test requirements we can't use coverage erase here
 	rm -fr .tox/
+	rm -f .coverage
 	rm -fr .coverage.*
 	rm -fr htmlcov/
 	rm -fr nosetests.html
@@ -56,6 +57,11 @@ lint: ## check style with flake8
 	pycodestyle enpt --exclude="*.ipynb,*.ipynb*" --max-line-length=120 > ./tests/linting/pycodestyle.log
 	-pydocstyle enpt > ./tests/linting/pydocstyle.log

+urlcheck: ## check for dead URLs
+	urlchecker check . \
+		--file-types .py,.rst,.md,.json \
+		--white-listed-patterns www.enmap.org  # certificate checks fail although URLs work
+
 test: ## run tests quickly with the default Python
 	python setup.py test


--- a/README.rst
+++ b/README.rst

-.. image:: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/img/EnPT_logo_final.svg
+.. image:: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/img/EnPT_logo_final.svg
   :width: 300px
   :alt: EnPT Logo

@@ -14,7 +14,7 @@ Ground Segment.

 * Please check the documentation_ for installation and usage instructions and in depth information.
 * Information on how to **cite the EnPT Python package** can be found in the
-  `CITATION <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/CITATION>`__ file.
+  `CITATION <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/CITATION>`__ file.


 License
@@ -41,14 +41,14 @@ Status

 |badge1| |badge2| |badge3| |badge4| |badge5| |badge6| |badge7| |badge8| |badge9|

-.. |badge1| image:: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/badges/master/pipeline.svg
-    :target: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/pipelines
+.. |badge1| image:: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/badges/master/pipeline.svg
+    :target: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/pipelines

-.. |badge2| image:: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/badges/master/coverage.svg
-    :target: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/coverage/
+.. |badge2| image:: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/badges/master/coverage.svg
+    :target: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/coverage/

 .. |badge3| image:: https://img.shields.io/static/v1?label=Documentation&message=GitLab%20Pages&color=orange
-    :target: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/
+    :target: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/

 .. |badge4| image:: https://img.shields.io/pypi/v/enpt.svg
    :target: https://pypi.python.org/pypi/enpt
@@ -57,7 +57,7 @@ Status
        :target: https://anaconda.org/conda-forge/enpt

 .. |badge6| image:: https://img.shields.io/pypi/l/enpt.svg
-    :target: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/LICENSE
+    :target: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/LICENSE

 .. |badge7| image:: https://img.shields.io/pypi/pyversions/enpt.svg
    :target: https://img.shields.io/pypi/pyversions/enpt.svg
@@ -74,7 +74,7 @@ History / Changelog
 -------------------

 You can find the protocol of recent changes in the EnPT package
-`here <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/HISTORY.rst>`__.
+`here <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/blob/master/HISTORY.rst>`__.

 Credits
 -------
@@ -89,8 +89,8 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack

 .. _Cookiecutter: https://github.com/audreyr/cookiecutter
 .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
-.. _documentation: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc
-.. _coverage: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/coverage/
-.. _nosetests: https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/nosetests_reports/nosetests.html
-.. _SICOR: https://gitext.gfz-potsdam.de/EnMAP/sicor
-.. _AROSICS: https://gitext.gfz-potsdam.de/danschef/arosics
\ No newline at end of file
+.. _documentation: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc
+.. _coverage: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/coverage/
+.. _nosetests: https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/nosetests_reports/nosetests.html
+.. _SICOR: https://git.gfz-potsdam.de/EnMAP/sicor
+.. _AROSICS: https://git.gfz-potsdam.de/danschef/arosics
\ No newline at end of file
--- a/bin/enpt_cli.py
+++ b/bin/enpt_cli.py
@@ -59,7 +59,7 @@ def get_enpt_argparser():
    #       => see docs in parsedArgs_to_user_opts() for explanation
    add('-jc', '--json_config', nargs='?', type=str,
        help='file path of a JSON file containing options. See here for an example: '
-             'https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/'
+             'https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/'
             'EnPT/blob/master/enpt/options/options_default.json')
    add('--CPUs', type=int, default=None,
        help='number of CPU cores to be used for processing (default: "None" -> use all available')

--- a/docs/about.rst
+++ b/docs/about.rst
@@ -21,5 +21,5 @@ Feature overview
 * orthorectification
 * write EnMAP Level-2 output data

-.. _SICOR: https://gitext.gfz-potsdam.de/EnMAP/sicor
-.. _AROSICS: https://gitext.gfz-potsdam.de/danschef/arosics
+.. _SICOR: https://git.gfz-potsdam.de/EnMAP/sicor
+.. _AROSICS: https://git.gfz-potsdam.de/danschef/arosics
--- a/docs/algorithm_descriptions.rst
+++ b/docs/algorithm_descriptions.rst
@@ -88,8 +88,8 @@ EnMAP image data at the indicated dead pixel positions. It supports two interpol
 Atmospheric correction
 **********************

-.. image:: https://gitext.gfz-potsdam.de/EnMAP/sicor/raw/master/docs/images/sicor_logo_lr.png
-   :target: https://gitext.gfz-potsdam.de/EnMAP/sicor
+.. image:: https://git.gfz-potsdam.de/EnMAP/sicor/raw/master/docs/images/sicor_logo_lr.png
+   :target: https://git.gfz-potsdam.de/EnMAP/sicor
   :width: 150px
   :alt: SICOR Logo

@@ -105,8 +105,8 @@ German Research Centre for Geosciences (GFZ) Potsdam. For details on the underly
 Spatial Co-Registration
 ***********************

-.. image:: https://gitext.gfz-potsdam.de/danschef/arosics/raw/master/docs/images/arosics_logo.png
-   :target: https://gitext.gfz-potsdam.de/danschef/arosics
+.. image:: https://git.gfz-potsdam.de/danschef/arosics/raw/master/docs/images/arosics_logo.png
+   :target: https://git.gfz-potsdam.de/danschef/arosics
   :width: 150px
   :alt: AROSICS Logo

@@ -187,7 +187,7 @@ summarized below:
    +-----------------------------------------------+---------------------+---------+-------------+


-.. _SICOR: https://gitext.gfz-potsdam.de/EnMAP/sicor
-.. _`documentation pages of SICOR`: http://enmap.gitext.gfz-potsdam.de/sicor/doc/
-.. _AROSICS: https://gitext.gfz-potsdam.de/danschef/arosics
+.. _SICOR: https://git.gfz-potsdam.de/EnMAP/sicor
+.. _`documentation pages of SICOR`: https://enmap.git-pages.gfz-potsdam.de/sicor/doc/
+.. _AROSICS: https://git.gfz-potsdam.de/danschef/arosics
 .. _pyresample: https://github.com/pytroll/pyresample
\ No newline at end of file
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -8,7 +8,7 @@ EnPT documentation
   :maxdepth: 2

   about
-   Source code repository <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT>
+   Source code repository <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT>
   installation
   usage
   algorithm_descriptions.rst

--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -5,18 +5,18 @@ From EnMAP Level-1B to Level-2A
 *******************************

 In this tutorial, we generate EnMAP_ Level-2A from Level-1B data using the EnMAP processing tool (EnPT_).
-Please refer to the overview about EnMAP data products `here <http://www.enmap.org/dataproducts.html>`__ to learn more
-about the differences between EnMAP processing levels.
+Please refer to the overview about EnMAP data products `here <https://www.enmap.org/mission/dataproducts/>`__ to learn
+more about the differences between EnMAP processing levels.

 As described in the :ref:`usage` section of this documentation, the input parameters of EnPT_ can be set using the
 Python application programming interface (API), the command line interface (CLI) or the graphical userface (GUI) within
 the EnMAP-Box_ in QGIS_. In this tutorial, we will use the GUI for simplicity. More information about the GUI can be
-found `here <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp>`__.
+found `here <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp>`__.


-.. _EnPT: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT
-.. _EnMAP: http://www.enmap.org/
-.. _EnMAP-Box: http://www.enmap.org/enmapbox.html
+.. _EnPT: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT
+.. _EnMAP: https://www.enmap.org/
+.. _EnMAP-Box: https://www.enmap.org/data_tools/enmapbox/
 .. _QGIS: https://www.qgis.org


@@ -31,19 +31,20 @@ This tutorial requires some software to be installed on your machine:
    - QGIS_ and the EnMAP-Box_
      (see `here <https://enmap-box.readthedocs.io/en/latest/usr_section/usr_installation.html>`__
      for installation instructions)
-    - EnPT_ (see `here <https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/installation.html>`__
+    - EnPT_ (see `here <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/installation.html>`__
+      for installation instructions)
+    - `EnPT EnMAP-Box App (GUI)`_ (see `here
+      <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp/doc/installation.html>`__
      for installation instructions)
-    - `EnPT EnMAP-Box App (GUI)`_ (see `here <http://enmap.gitext.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp/doc/
-      installation.html>`__ for installation instructions)

-.. _`EnPT EnMAP-Box App (GUI)`: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp
+.. _`EnPT EnMAP-Box App (GUI)`: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp


 Data
 """"

 You can download the input data for this tutorial
-`here <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/raw/master/tests/data/
+`here <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/tree/master/tests/data/
 EnMAP_Level_1B/ENMAP01-____L1B-DT000000987_20130205T105307Z_001_V000101_20190426T143700Z__rows0-99.zip>`__.

 Inspect the Level-1B data
@@ -52,7 +53,7 @@ Inspect the Level-1B data
 The downloaded zip-archive contains a subset of an EnMAP Level-1B dataset covering a rural region in Bavaria, Germany.

 Extract the zip-archive on your local disk and inspect the extracted files. An explanation of all the contained files
-is given `here <https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/raw/master/tests/data/>`__.
+is given `here <https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/-/tree/master/tests/data/>`__.

 .. image:: img/tut__contents_test_dataset.png


--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -22,7 +22,7 @@ To run the whole EnPT processing pipeline via the Python API:
    CTR.run_all_processors()

 Further *configuration parameters* are documented
-`here <https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.options.html#enpt.options.config.EnPTConfig>`__.
+`here <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.options.html#enpt.options.config.EnPTConfig>`__.
 Note that the class `EnPTConfig` takes the same keyword arguments like the `EnPT_Controller` class.

 You can also pass a *JSON-File with your EnPT configuration* to the `EnPT_Controller` class. This allows you to easily
@@ -60,7 +60,7 @@ Note, that the processors are built on each other, so the order must be unchange

   Get the in-memory Python object representing the Level-1 dataset (NOTE: the attributes and methods of this
   Python object are documented
-   `here <https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.model.html#enpt.model.images.EnMAPL1Product_SensorGeo>`__):
+   `here <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.model.html#enpt.model.images.EnMAPL1Product_SensorGeo>`__):

   .. code-block:: python

@@ -100,7 +100,7 @@ Note, that the processors are built on each other, so the order must be unchange
      self.run_orthorectification()

   From now on, you may get the in-memory EnMAP Level-2 Python object (attributes and methods are documented
-   `here <https://enmap.gitext-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.model.html#enpt.model.images.EnMAPL2Product_MapGeo>`__):
+   `here <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/enpt.model.html#enpt.model.images.EnMAPL2Product_MapGeo>`__):

   .. code-block:: python

@@ -143,6 +143,6 @@ Here is screenshot of the current version:

 .. image:: img/screenshot_enpt_enmapboxapp_874x1267.png

-.. _enpt_enmapboxapp: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp
-.. _enpt/options/options_default.json: https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/blob/master/enpt/options/options_default.json
-.. _SICOR: https://gitext.gfz-potsdam.de/EnMAP/sicor
\ No newline at end of file
+.. _enpt_enmapboxapp: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/enpt_enmapboxapp
+.. _enpt/options/options_default.json: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/blob/master/enpt/options/options_default.json
+.. _SICOR: https://git.gfz-potsdam.de/EnMAP/sicor
\ No newline at end of file
--- a/enpt/model/images/image_baseclasses.py
+++ b/enpt/model/images/image_baseclasses.py
@@ -107,7 +107,7 @@ class _EnMAP_Image(object):
            - show_map(*args, **kwargs):  plot a map of the image (based on cartopy library)
            - reproject_to_new_grid(*args, **kwargs)

-        Usage (there will soon be detailed instructions on usage at https://gitext.gfz-potsdam.de/danschef/geoarray):
+        Usage (there will soon be detailed instructions on usage at https://git.gfz-potsdam.de/danschef/geoarray):

            - Use self.data like a normal numpy.ndarray!
                - NOTE: Operators like *, /, + , - will soon be implemented. In the meanwhile use:

--- a/enpt/version.py
+++ b/enpt/version.py
@@ -27,6 +27,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.

-__version__ = '0.16.3'
-__versionalias__ = '20201103.01'
+__version__ = '0.16.4'
+__versionalias__ = '20201210.01'
 __author__ = 'Daniel Scheffler'
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ req = [

 req_setup = ['setuptools-git']  # needed for package_data version controlled by GIT

-req_test = ['coverage', 'nose', 'nose2', 'nose-htmloutput', 'rednose']
+req_test = ['coverage', 'nose', 'nose2', 'nose-htmloutput', 'rednose', 'urlchecker']

 req_doc = ['sphinx-argparse', 'sphinx_rtd_theme']

@@ -106,7 +106,7 @@ setup(
    setup_requires=req_setup,
    test_suite='tests',
    tests_require=req_test,
-    url='https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT',
+    url='https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT',
    version=version['__version__'],
    zip_safe=False
 )
--- a/tests/gitlab_CI_docker/build_enpt_testsuite_image.sh
+++ b/tests/gitlab_CI_docker/build_enpt_testsuite_image.sh
@@ -5,14 +5,6 @@ dockerfile="enpt_ci.docker"
 tag="enpt_ci:0.14.1"
 gitlab_runner="enpt_gitlab_CI_runner"

-# get sicor project
-rm -rf context/sicor
-git clone git@gitext.gfz-potsdam.de:EnMAP/sicor.git ./context/sicor
-# git clone git@gitext.gfz-potsdam.de:EnMAP/sicor.git --branch feature/improve_enmap --single-branch ./context/sicor
-cd ./context/sicor
-git lfs pull
-cd ../..
-
 echo "#### Build runner docker image"
 docker rmi ${tag}
 docker build ${context_dir} \
@@ -36,7 +28,7 @@ docker run \
    gitlab/gitlab-runner:latest

 # register the runner at the corresponding GitLab repository via a registration-token
-echo "#### Register container at gitlab, get token here https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/settings/ci_cd"
+echo "#### Register container at gitlab, get token here https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT/settings/ci_cd"
 read -p "Please enter gitlab token: " token
 echo ""
 read -p "Please enter gitlab runner name: " runner_name
@@ -49,7 +41,7 @@ gitlab-ci-multi-runner register \
  --non-interactive \
  --executor 'docker' \
  --docker-image '${tag}' \
-  --url 'https://gitext.gfz-potsdam.de/ci' \
+  --url 'https://git.gfz-potsdam.de/ci' \
  --registration-token '${token}' \
  --description '${runner_name}' \
  --tag-list enpt_ci_client \

--- a/tests/gitlab_CI_docker/context/enpt_ci.docker
+++ b/tests/gitlab_CI_docker/context/enpt_ci.docker
@@ -12,12 +12,3 @@ RUN /bin/bash -i -c "\
    conda update -n base -c conda-forge conda;\
    conda activate ci_env; \
    conda env update -n ci_env -f /root/environment_enpt.yml"
-
-# copy sicor code to /tmp
-COPY sicor /tmp/sicor
-
-# install sicor (in pip development mode so that its root directory in /tmp/sicor matching with the subsequent COPY command)
-RUN bash -i -c "\
-    source /root/miniconda3/bin/activate ci_env; \
-    cd /tmp/sicor/ ; \
-    pip install -e ."
--- a/tests/gitlab_CI_docker/context/environment_enmapbox_enpt.yml
+++ b/tests/gitlab_CI_docker/context/environment_enmapbox_enpt.yml
+name: enmapbox_enpt
+
+channels: &id1
+  - conda-forge
+
+dependencies:
+  - python=3.*.*
+  - pip  # avoids that conda uses the wrong pip
+  - enpt
+  - matplotlib
+  - netcdf4
+  - numba
+  - numpy
+  - pyopengl
+  - qgis
+  - scikit-learn
+
+  - pip:
+    - astropy
+    - enpt_enmapboxapp
+    - scipy
--- a/tests/gitlab_CI_docker/context/environment_enpt.yml
+++ b/tests/gitlab_CI_docker/context/environment_enpt.yml
@@ -13,9 +13,10 @@ dependencies:
  - numpy
  - pandas
  - pyproj>=2.2.0
-  - py_tools_ds>=0.14.25
+  - py-tools-ds>=0.14.25
  - scikit-image
  - sensormapgeo>=0.4.0
+  - sicor>=0.15.0

  - pip:
    - cerberus
@@ -39,3 +40,4 @@ dependencies:
    - rednose
    - sphinx-argparse
    - sphinx_rtd_theme
+    - urlchecker