Processing/processing tools

.github/workflows/linter.yml

@@ -7,13 +7,13 @@ on:
 
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - '**.py'
   workflow_dispatch:
 
 env:
-  PROJECT_FOLDER: "map2loop"
+  PROJECT_FOLDER: "m2l"
   PYTHON_VERSION: 3.9
 permissions:
   contents: write
@@ -55,5 +55,5 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: "style: auto format fixes"
           body: "This PR applies style fixes by black and ruff."
-          base: master
+          base: main
           branch: lint/style-fixes-${{ github.run_id }}

.github/workflows/tester.yml

@@ -2,16 +2,12 @@ name: "🎳 Tester"
 
 on:
   push:
-    branches:
-      - main
     paths:
       - '**.py'
       - .github/workflows/tester.yml
       - requirements/testing.txt
 
   pull_request:
-    branches:
-      - main
     paths:
       - '**.py'
       - .github/workflows/tester.yml
@@ -45,55 +41,62 @@ jobs:
       - name: Run Unit tests
         run: pytest -p no:qgis tests/unit/
 
-  # test-qgis:
-  #   runs-on: ubuntu-latest
-
-  #   container:
-  #     image: qgis/qgis:3.4
-  #     env:
-  #       CI: true
-  #       DISPLAY: ":1"
-  #       MUTE_LOGS: true
-  #       NO_MODALS: 1
-  #       PYTHONPATH: "/usr/share/qgis/python/plugins:/usr/share/qgis/python:."
-  #       QT_QPA_PLATFORM: "offscreen"
-  #       WITH_PYTHON_PEP: false
-  #     # be careful, things have changed since QGIS 3.40. So if you are using this setup 
-  #     #  with a QGIS version older than 3.40, you may need to change the way you set up the container
-  #     volumes:
-  #       # Mount the X11 socket to allow GUI applications to run
-  #       - /tmp/.X11-unix:/tmp/.X11-unix
-  #       # Mount the workspace directory to the container
-  #       - ${{ github.workspace }}:/home/root/
-
-  #   steps:
-  #     - name: Get source code
-  #       uses: actions/checkout@v4
-
-  #     - name: Print QGIS version
-  #       run: qgis --version
-
-  #     # Uncomment if you need to run a script to set up the plugin in QGIS docker image < 3.40
-  #     # - name: Setup plugin
-  #     #   run: qgis_setup.sh ${{ env.PROJECT_FOLDER }}
-
-  #     - name: Install Python requirements
-  #       run: |
-  #         apt update && apt install -y python3-pip python3-venv pipx
-  #         # Create a virtual environment
-  #         cd /home/root/
-  #         pipx run qgis-venv-creator --venv-name ".venv"
-  #         # Activate the virtual environment
-  #         . .venv/bin/activate
-  #         # Install the requirements
-  #         python3 -m pip install -U -r requirements/testing.txt
-
-  #     - name: Run Unit tests
-  #       run: |
-  #         cd /home/root/
-  #         # Activate the virtual environment
-  #         . .venv/bin/activate
-  #         # Run the tests
-  #         # xvfb-run is used to run the tests in a virtual framebuffer
-  #         # This is necessary because QGIS requires a display to run
-  #         xvfb-run python3 -m pytest tests/qgis --junitxml=junit/test-results-qgis.xml --cov-report=xml:coverage-reports/coverage-qgis.xml
+  test-qgis:
+    runs-on: ubuntu-latest
+
+    container:
+      image: qgis/qgis:latest
+      env:
+        CI: true
+        DISPLAY: ":1"
+        MUTE_LOGS: true
+        NO_MODALS: 1
+        PYTHONPATH: "/usr/share/qgis/python/plugins:/usr/share/qgis/python:."
+        QT_QPA_PLATFORM: "offscreen"
+        WITH_PYTHON_PEP: false
+      # be careful, things have changed since QGIS 3.40. So if you are using this setup 
+      #  with a QGIS version older than 3.40, you may need to change the way you set up the container
+      volumes:
+        # Mount the X11 socket to allow GUI applications to run
+        - /tmp/.X11-unix:/tmp/.X11-unix
+        # Mount the workspace directory to the container
+        - ${{ github.workspace }}:/home/root/
+
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v4
+
+      - name: Print QGIS version
+        run: qgis --version
+
+      # Uncomment if you need to run a script to set up the plugin in QGIS docker image < 3.40
+      # - name: Setup plugin
+      #   run: qgis_setup.sh ${{ env.PROJECT_FOLDER }}
+
+      - name: Install Python requirements
+        run: |
+          apt update && apt install -y python3-pip python3-venv pipx
+          # Create a virtual environment
+          cd /home/root/
+          pipx run qgis-venv-creator --venv-name ".venv"
+          # Activate the virtual environment
+          . .venv/bin/activate
+          # Install the requirements
+          python3 -m pip install -U -r requirements/testing.txt
+          python3 -m pip install git+https://github.com/Loop3D/map2loop.git@noelle/contact_extractor
+
+      - name: verify input data
+        run: |
+          cd /home/root/
+          . .venv/bin/activate
+          ls -la tests/qgis/input/ || echo "Input directory not found"
+
+      - name: Run Unit tests
+        run: |
+          cd /home/root/
+          # Activate the virtual environment
+          . .venv/bin/activate
+          # Run the tests
+          # xvfb-run is used to run the tests in a virtual framebuffer
+          # This is necessary because QGIS requires a display to run
+          xvfb-run python3 -m pytest tests/qgis --junitxml=junit/test-results-qgis.xml --cov-report=xml:coverage-reports/coverage-qgis.xml

docs/conf.py

@@ -15,7 +15,7 @@
 import sphinx_rtd_theme  # noqa: F401 theme of Read the Docs
 
 # Package
-from map2loop import __about__
+from m2l import __about__
 
 # -- Build environment -----------------------------------------------------
 on_rtd = environ.get("READTHEDOCS", None) == "True"

map2loop/gui/dlg_settings.py → m2l/gui/dlg_settings.py

@@ -18,15 +18,15 @@
 from qgis.PyQt.QtGui import QDesktopServices, QIcon
 
 # project
-from map2loop.__about__ import (
+from m2l.__about__ import (
     __icon_path__,
     __title__,
     __uri_homepage__,
     __uri_tracker__,
     __version__,
 )
-from map2loop.toolbelt import PlgLogger, PlgOptionsManager
-from map2loop.toolbelt.preferences import PlgSettingsStructure
+from m2l.toolbelt import PlgLogger, PlgOptionsManager
+from m2l.toolbelt.preferences import PlgSettingsStructure
 
 # ############################################################################
 # ########## Globals ###############