Merge pull request #1045 from EnMAP-Box/update_3.15

Update 3.15
EnMAP-Box · Dec 3, 2024 · 9d9df51 · 9d9df51
2 parents ea3c6ab + 9a99776
commit 9d9df51
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 27 deletions.
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -7,7 +7,8 @@ on:
   pull_request:
     branches:
       - main
-      - release-**
+      - 'release-**'
+      - 'release_**'
 
 jobs:
   flake8_py3:

diff --git a/.github/workflows/run-tests-mamba.yml b/.github/workflows/run-tests-mamba.yml
@@ -13,7 +13,7 @@ on:
       - release_**
 
   release:
-    types: [published]
+    types: [ published ]
 
 jobs:
   # Run EnMAP-Box tests
@@ -30,12 +30,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mamba_env: [enmapbox_light_latest, enmapbox_light_longterm]
+        mamba_env: [ enmapbox_light_latest, enmapbox_light_longterm ]
       # python_version : [3.9, 3.10, 3.11]
       # mamba_env: [enmapbox_light_latest, enmapbox_light_longterm, enmapbox_full_latest, enmapbox_full_longterm]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -48,19 +48,20 @@ jobs:
           echo "conda environment file: ${{matrix.mamba_env}}.yml"
           cat .env/conda/${{matrix.mamba_env}}.yml
 
-      - name: Setup Mambaforge
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Setup Miniforge
+        uses: conda-incubator/setup-miniconda@v3
         with:
           # miniforge-variant: Mambaforge
           # miniforge-version: latest
-          mamba-version: "*"
-          channels: conda-forge,defaults
-          channel-priority: true
+          # mamba-version: "*"
+          # channels: conda-forge,defaults
+          # channel-priority: true
           activate-environment: ${{matrix.mamba_env}}
           environment-file: .env/conda/${{matrix.mamba_env}}.yml
-          clean-patched-environment-file: false
-          use-mamba: true
-          auto-activate-base: false
+          miniforge-version: latest
+          # clean-patched-environment-file: false
+          # use-mamba: true
+          # auto-activate-base: false
       - name: Mamba Environment Info
         run: |
           mamba info

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -4,9 +4,9 @@ on:
   push:
     branches:
       - main
-      - release-**
+      - 'release-**'
       - refactor_environments
-      - release_**
+      - 'release_**'
 
   pull_request:
     branches:
@@ -15,19 +15,19 @@ on:
       - release_**
 
   release:
-    types: [published]
+    types: [ published ]
 
 jobs:
   # Run EnMAP-Box tests
   test:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        qgis_version: [3.34, 3.36, 3.38]
+        qgis_version: [ 3.34, 3.36, 3.38 ]
       fail-fast: false
 
     env:
-        QGIS_TEST_VERSION: ${{ matrix.qgis_version}}
+      QGIS_TEST_VERSION: ${{ matrix.qgis_version}}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
           python3 --version
           pip list
       - name: Test EnMAP-Box on QGIS
-        run: | 
+        run: |
           chmod +x .env/docker/run_docker_tests.sh
           ls -la .env/docker
           docker compose -f .env/docker/docker-compose.gh.yml run qgis /usr/src/.env/docker/run_docker_tests.sh -n auto
diff --git a/.../enmap-box/enmapbox/coreapps/decorrelationstretchapp/test_decorrelationstretchrenderer.py b/.../enmap-box/enmapbox/coreapps/decorrelationstretchapp/test_decorrelationstretchrenderer.py
@@ -1,17 +1,16 @@
 import numpy as np
-
-from decorrelationstretchapp.decorrelationstretchrenderer import DecorrelationStretchRenderer
-from qgis.core import QgsRasterLayer, Qgis
 from sklearn.decomposition import PCA
 from sklearn.preprocessing import RobustScaler, MinMaxScaler
 
-from enmapboxtestdata import enmap
+from decorrelationstretchapp.decorrelationstretchrenderer import DecorrelationStretchRenderer
 from enmapboxprocessing.rasterreader import RasterReader
 from enmapboxprocessing.testcase import TestCase
 from enmapboxprocessing.utils import Utils
+from enmapboxtestdata import enmap
+from qgis.core import QgsRasterLayer, Qgis
 
 
-class TestClassFractionRenderer(TestCase):
+class TestDecorrelationStretchRenderer(TestCase):
 
     def test_enmap(self):
         layer = QgsRasterLayer(enmap)

diff --git a/tests/enmap-box/enmapbox/coreapps/test_metadataeditorapp.py b/tests/enmap-box/enmapbox/coreapps/test_metadataeditorapp.py
@@ -27,9 +27,9 @@
 from enmapbox.exampledata import enmap
 from enmapbox.gui.enmapboxgui import EnMAPBox
 from enmapbox.testing import TestObjects, EnMAPBoxTestCase
+from enmapbox.testing import start_app
 from metadataeditorapp.metadataeditor import MetadataEditorDialog
 from qgis.core import QgsRasterLayer, QgsVectorLayer, QgsProject
-from enmapbox.testing import start_app
 
 start_app()
 
@@ -77,7 +77,6 @@ def test_MDDialog_QgsProject(self):
 
     def test_speed(self):
         from enmapbox.exampledata import enmap
-
         lyr = QgsRasterLayer(enmap, 'EnMAP')
 
         d = MetadataEditorDialog()
@@ -86,9 +85,10 @@ def test_speed(self):
         QgsProject.instance().addMapLayer(lyr)
 
         t0 = datetime.datetime.now()
-        # d.setLayer(lyr)
+        d.setLayer(lyr)
         dt = datetime.datetime.now() - t0
 
+        self.assertTrue(dt.seconds < 1)
         self.showGui(d)
 
         QgsProject.instance().removeAllMapLayers()

diff --git a/...mapboxprocessing/algorithm/test_PrepareRegressionDatasetFromContinuousLibraryAlgorithm.py b/...mapboxprocessing/algorithm/test_PrepareRegressionDatasetFromContinuousLibraryAlgorithm.py
@@ -10,7 +10,7 @@
 from qgis.core import QgsGeometry, QgsPointXY, QgsVectorLayer, QgsCoordinateReferenceSystem
 
 
-class TestPrepareClassificationDatasetFromCategorizedLibrary(TestCase):
+class TestPrepareRegressionDatasetFromContinuousLibraryAlgorithm(TestCase):
 
     def test(self):
         alg = PrepareRegressionDatasetFromContinuousLibraryAlgorithm()