Unverified Commit efb76a76 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	HISTORY.rst
#	enpt_enmapboxapp/version.py
parents 283938a9 b57b16ff
Pipeline #38782 failed with stages
in 2 minutes and 43 seconds
......@@ -10,7 +10,7 @@ stages:
test_enpt_enmapboxapp:
stage: test
script:
- source /root/miniconda3/bin/activate ci_env
- source /root/mambaforge/bin/activate ci_env
# install enpt_enmapboxapp, otherwise the executable scripts are not in place
- pip install -e .
......@@ -27,7 +27,7 @@ test_enpt_enmapboxapp:
# set environment variables
- export IS_CI_ENV=1 # to notify tests that they are running within a docker CI system
- export ANACONDA_ROOT=/root/miniconda3/
- export ANACONDA_ROOT=/root/mambaforge/
- export IS_ENPT_GUI_TEST=1
# run nosetests
......@@ -48,7 +48,7 @@ test_enpt_enmapboxapp:
test_styles:
stage: test
script:
- source /root/miniconda3/bin/activate ci_env
- source /root/mambaforge/bin/activate ci_env
- make lint
artifacts:
paths:
......@@ -62,7 +62,7 @@ test_styles:
test_urls:
stage: test
script:
- source /root/miniconda3/bin/activate ci_env
- source /root/mambaforge/bin/activate ci_env
- pip install -U urlchecker
- make urlcheck
when: always
......@@ -71,12 +71,10 @@ test_urls:
test_enpt_enmapboxapp_install:
stage: test
script:
- source /root/miniconda3/bin/activate
- source /root/mambaforge/bin/activate
# update conda and python and update mamba
- conda update -n base -c conda-forge conda
# - conda update -c conda-forge python
- conda update -c conda-forge mamba
# update base environment
- mamba update -n base -c conda-forge --all
# create an environment containing qgis, enpt and the EnMAP-Box requirements
- mamba env create -f tests/gitlab_CI_docker/context/environment_enpt_enmapboxapp.yml
......@@ -88,7 +86,7 @@ test_enpt_enmapboxapp_install:
- git clone -b master https://bitbucket.org/hu-geomatics/enmap-box.git
- pip install -r https://bitbucket.org/hu-geomatics/enmap-box/raw/master/requirements.txt ; \ # should all be there
- cd enmap-box
- pip install .
- pip install -e .
- cd ../enpt_enmapboxapp
# install enpt_enmapboxapp
......@@ -148,7 +146,7 @@ deploy_pypi:
dependencies:
- test_enpt_enmapboxapp
script:
- source /root/miniconda3/bin/activate ci_env
- source /root/mambaforge/bin/activate ci_env
- pip install -U twine
- python setup.py sdist
- twine upload dist/* # requires creds as environment variables
......
......@@ -2,12 +2,18 @@
History
=======
0.6.2 (2022-02-15)
0.6.3 (2022-02-15)
------------------
* Fixed "No output raster was written" error message in case out BIL or BIP output interleave.
0.6.2 (2021-06-23)
------------------
* Disabled parameters that are currently not implemented in EnPT.
0.6.1 (2021-06-18)
------------------
......
......@@ -97,7 +97,7 @@ docs: ## generate Sphinx HTML documentation, including API docs
$(MAKE) -C docs html
#$(MAKE) -C docs latex
# $(MAKE) -C docs latexpdf
$(BROWSER) docs/_build/html/index.html
#$(BROWSER) docs/_build/html/index.html
servedocs: docs ## compile the docs watching for changes
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
......
......@@ -270,17 +270,17 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
defaultValue=10000, minValue=0),
advanced=True)
self.addParameter(
QgsProcessingParameterBoolean(
name=self.P_enable_keystone_correction,
description='Keystone correction',
defaultValue=False))
# self.addParameter(
# QgsProcessingParameterBoolean(
# name=self.P_enable_keystone_correction,
# description='Keystone correction',
# defaultValue=False))
self.addParameter(
QgsProcessingParameterBoolean(
name=self.P_enable_vnir_swir_coreg,
description='VNIR/SWIR co-registration',
defaultValue=False))
# self.addParameter(
# QgsProcessingParameterBoolean(
# name=self.P_enable_vnir_swir_coreg,
# description='VNIR/SWIR co-registration',
# defaultValue=False))
self.addParameter(
QgsProcessingParameterRasterLayer(
......@@ -346,11 +346,11 @@ class _EnPTBaseAlgorithm(QgsProcessingAlgorithm):
defaultValue=10000, minValue=0),
advanced=True)
self.addParameter(
QgsProcessingParameterBoolean(
name=self.P_run_smile_P,
description='Smile detection and correction (provider smile coefficients are ignored)',
defaultValue=False))
# self.addParameter(
# QgsProcessingParameterBoolean(
# name=self.P_run_smile_P,
# description='Smile detection and correction (provider smile coefficients are ignored)',
# defaultValue=False))
self.addParameter(
QgsProcessingParameterBoolean(
......
......@@ -22,6 +22,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.6.2'
__version__ = '0.6.3'
__versionalias__ = '20220215.01'
__author__ = 'Daniel Scheffler'
FROM ci_base_centos:0.1
FROM ci_base_centos:0.2
# install Xvfb to be able to assign a DISPLAY for Qt tests
RUN yum install -y xorg-x11-server-Xvfb
......@@ -6,37 +6,32 @@ RUN yum install -y xorg-x11-server-Xvfb
# copy some needed stuff to /root
COPY *.yml /root/
# # update Miniconda
# ENV miniconda_dl 'Miniconda3-latest-Linux-x86_64.sh'
# RUN /bin/bash -i -c "\
# rm -rf /root/miniconda3 ; \
# wget https://repo.continuum.io/miniconda/$miniconda_dl -P /root/ ; \
# bash -i /root/$miniconda_dl -b ; \
# rm -f /root/$miniconda_dl"
# update the ci_env environment (that already contains all packages installed via 'docker_pyenvs' repo)
# -> also include packages for conda deployment and upload
# NOTE: The pkgs directory (cache) is deleted because otherwise conda env create takes hours within a docker container.
RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate ; \
conda update -n base -c conda-forge conda;\
conda install -c conda-forge mamba ; \
source /root/mambaforge/bin/activate ; \
mamba update -n base -c conda-forge --all;\
conda activate ci_env; \
mamba env update -n ci_env -f /root/environment_enpt_enmapboxapp.yml"
mamba env update -n ci_env -f /root/environment_enpt_enmapboxapp.yml; \
rm -rf /root/mambaforge/pkgs"
# copy enmapbox code to /tmp
COPY enmapbox /tmp/enmapbox
# install enmapbox (in pip development mode)
RUN bash -i -c "\
source /root/miniconda3/bin/activate ci_env ; \
source /root/mambaforge/bin/activate ci_env ; \
cd /tmp/enmapbox/ ; \
pip install -r https://bitbucket.org/hu-geomatics/enmap-box/raw/develop/requirements.txt ; \
pip install -e . ; \
conda list"
# install enpt (into separate conda environment)
# NOTE: The pkgs directory (cache) is deleted because otherwise conda env create takes hours within a docker container.
RUN bash -i -c "\
source /root/miniconda3/bin/activate ; \
source /root/mambaforge/bin/activate ; \
mamba create -n enpt -c conda-forge enpt ; \
conda activate enpt ; \
conda list"
conda list ; \
rm -rf /root/mambaforge/pkgs"
Supports Markdown
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