Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

.github/workflows/linux.yml

@@ -109,12 +109,9 @@ jobs:
 
     - name: Building Examples and Tests
       if: matrix.build_type == 'full'
-      # need to explicitly uninstall matplotlib below because pandas pulls it in but we need a newer version for test stability
-      # having both installed confuses matplotlib https://github.com/matplotlib/matplotlib/issues/26827
       # the pipdeptree below is also just for debugging but often comes handy so keep it enabled
       run: |
         sudo apt-get install $(cat sumo/build_config/tools_req_deb.txt)
-        sudo apt-get -y remove python3-matplotlib
         python3 -m venv testenv --system-site-packages
         source testenv/bin/activate
         python3 -m pip install -r sumo/tools/req_ci.txt -r sumo/tools/requirements.txt

.github/workflows/macos-wheels.yml

@@ -24,11 +24,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, macos-14]
-        python_version: [3.8, 3.9, '3.10', 3.11, 3.12]
-        exclude:
-          - os: macos-14
+        python_version: ['3.10', 3.11, 3.12, 3.13]
+        include:
+          - os: macos-13
             python_version: 3.8
-          - os: macos-14
+          - os: macos-13
             python_version: 3.9
 
     runs-on: ${{ matrix.os }}
@@ -91,8 +91,6 @@ jobs:
         os: [macos-13, macos-14, macos-15]
         python_version: ['3.10', 3.11, 3.12]
         include:
-          - os: macos-13
-            python_version: 3.8
           - os: macos-13
             python_version: 3.9
     runs-on: ${{ matrix.os }}

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
     rev: v3.2.0
     hooks:
     -   id: trailing-whitespace
-        exclude: '.*\.rtf'
+        exclude: '.*\.rtf|image.*\.tools'
     -   id: end-of-file-fixer
         exclude: '.*\.rtf'
     -   id: check-yaml