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

Merge branch 'master' into feature/adapt_to_single_env

# Conflicts:
#	HISTORY.rst
parents a1aed942 950aa73b
Pipeline #23768 failed with stage
in 1 minute and 5 seconds
......@@ -5,6 +5,8 @@ History
0.5.0 (coming soon)
-------------------
* 'make lint' now additionally prints the log outputs.
* Replaced deprecated URLs. Fixed 'make lint'.
* Removed classifiers for Python<=3.5.
* Split enpt_enmapboxapp.py into separate modules - one on case EnPT is installed externally and
one in case it is part of the QGIS environment. Added EnPTAlgorithm for the latter case and respective test.
......@@ -14,6 +16,7 @@ History
0.4.7 (2021-01-11)
------------------
* Updated GitLab URLs due to changes on the server side.
* Moved enmap-box, sicor and enpt download from build_enpt_enmapboxapp_testsuite_image.sh to new before_script.sh
and adjusted 'make gitlab_CI_docker' accordingly.
......
......@@ -48,6 +48,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
......@@ -55,9 +56,12 @@ clean-test: ## remove test and coverage artifacts
rm -fr .pytest_cache
lint: ## check style with flake8
flake8 --max-line-length=120 enpt_enmapboxapp tests > ./tests/linting/flake8.log
pycodestyle enpt_enmapboxapp --exclude="*.ipynb,*.ipynb*" --max-line-length=120 > ./tests/linting/pycodestyle.log
-pydocstyle enpt_enmapboxapp > ./tests/linting/pydocstyle.log
flake8 --max-line-length=120 . > ./tests/linting/flake8.log || \
(cat ./tests/linting/flake8.log && exit 1)
pycodestyle . --exclude="*.ipynb,*.ipynb*" --max-line-length=120 > ./tests/linting/pycodestyle.log || \
(cat ./tests/linting/pycodestyle.log && exit 1)
-pydocstyle . > ./tests/linting/pydocstyle.log || \
(cat ./tests/linting/pydocstyle.log && exit 1)
urlcheck: ## check for dead URLs
urlchecker check . \
......
......@@ -14,6 +14,6 @@ of QGIS_. It allows to parameterize EnPT_ and run the processing chain to genera
:scale: 100 %
.. _EnPT: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT
.. _EnMAP-Box: http://www.enmap.org/enmapbox.html
.. _EnMAP: http://www.enmap.org/
.. _EnMAP-Box: https://www.enmap.org/data_tools/enmapbox/
.. _EnMAP: https://www.enmap.org/
.. _QGIS: https://www.qgis.org
......@@ -31,7 +31,7 @@ project_root = os.path.dirname(cwd)
# version is used.
sys.path.insert(0, project_root)
import enpt_enmapboxapp
import enpt_enmapboxapp # noqa E402
# -- General configuration ---------------------------------------------
......
......@@ -25,5 +25,5 @@ environment. Please refer to the EnPT_ installation instructions
`here <https://enmap.git-pages.gfz-potsdam.de/GFZ_Tools_EnMAP_BOX/EnPT/doc/installation.html>`__.
.. _EnPT: https://git.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT
.. _EnMAP-Box: http://www.enmap.org/enmapbox.html
.. _EnMAP-Box: https://www.enmap.org/data_tools/enmapbox/
.. _QGIS: https://www.qgis.org
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