Merge branch 'main' into linker_simplification

Author: behrisch

.github/workflows/cibuildwheel.yml

@@ -147,4 +147,5 @@ jobs:
     needs: [generate-matrix, pure-python-wheels, build-wheels]
     uses: ./.github/workflows/test-wheels.yml
     with:
-      matrix: ${{ fromJSON(needs.generate-matrix.outputs.test_matrix) }}
+      matrix: ${{ needs.generate-matrix.outputs.test_matrix }}
+      wheel_source: 'python-wheels'

.github/workflows/test-wheels.yml

@@ -1,18 +1,38 @@
 name: Test wheels
 
 on:
+  push:
+    paths:
+      - '.github/workflows/test-wheels.yml'
   workflow_call:
     inputs:
       matrix:
         type: string
-        required: true
+        required: false
+      wheel_source:
+        type: string
+        required: false
+  workflow_dispatch:
+    inputs:
+      wheel_source:
+        type: string
+        required: false
+  schedule:
+    - cron:  '5 6 * * *'
 
 jobs:
+  maybe-generate-matrix:
+    if: inputs.matrix == ''
+    uses: ./.github/workflows/generate-matrix.yml
+
   test-wheels:
+    needs: [maybe-generate-matrix]
     strategy:
       fail-fast: false
-      matrix: ${{ fromJSON(inputs.matrix) }}
+      matrix: ${{ fromJSON(inputs.matrix || needs.maybe-generate-matrix.outputs.test_matrix) }}
     runs-on: ${{ matrix.os }}
+    env:
+      WHEEL_SOURCE: ${{ inputs.wheel_source || 'https://sumo.dlr.de/daily/ciwheels' }}
 
     steps:
     - name: Cloning SUMO
@@ -46,11 +66,11 @@ jobs:
       run: python -m pip install -r tools/req_ci.txt -r tools/requirements.txt
 
     - name: Installing sumo wheels (macos / windows)
-      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
+      if: ${{ !startsWith(matrix.os, 'ubuntu') || inputs.wheel_source != 'python-wheels'}}
       shell: bash
       run: |
         source testenv/*/activate
-        python -m pip install --no-index -f python-wheels eclipse_sumo
+        python -m pip install --no-index -f $WHEEL_SOURCE eclipse_sumo
         python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
 
     - name: Installing sumo wheels (linux)
@@ -97,11 +117,11 @@ jobs:
         python -m pip install texttest
 
     - name: Installing libsumo wheels (macos / windows)
-      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
+      if: ${{ !startsWith(matrix.os, 'ubuntu') || inputs.wheel_source != 'python-wheels' }}
       shell: bash
       run: |
         if [[ "${{ matrix.os }}" != "windows-latest" ]]; then source libsumo_testenv/*/activate; fi
-        python -m pip install --no-index -f python-wheels libsumo
+        python -m pip install --no-index -f $WHEEL_SOURCE libsumo
 
     - name: Installing libsumo wheels (linux)
       if: ${{ startsWith(matrix.os, 'ubuntu') }}

src/netedit/GNEApplicationWindowHelper.cpp

@@ -2289,8 +2289,7 @@ GNEApplicationWindowHelper::GNESumoConfigHandler::loadSumoConfig() {
 // GNENetconvertConfigHandler - methods
 // ---------------------------------------------------------------------------
 
-GNEApplicationWindowHelper::GNENetconvertConfigHandler::GNENetconvertConfigHandler(GNEApplicationWindow* applicationWindow, const std::string& sumoConfigFile) :
-    myApplicationWindow(applicationWindow),
+GNEApplicationWindowHelper::GNENetconvertConfigHandler::GNENetconvertConfigHandler(const std::string& sumoConfigFile) :
     myNetconvertConfigFile(sumoConfigFile) {
 }
 

src/netedit/GNEApplicationWindowHelper.h

@@ -1133,15 +1133,12 @@ struct GNEApplicationWindowHelper {
 
     public:
         /// @brief Constructor
-        GNENetconvertConfigHandler(GNEApplicationWindow* applicationWindow, const std::string& file);
+        GNENetconvertConfigHandler(const std::string& file);
 
         /// @brief load netconvert config
         bool loadNetconvertConfig();
 
     private:
-        /// @brief pointer to current GNEApplicationWindow
-        GNEApplicationWindow* myApplicationWindow;
-
         /// @brief netconvert config file
         const std::string myNetconvertConfigFile;
 

src/netedit/GNELoadThread.cpp

@@ -132,7 +132,7 @@ GNELoadThread::run() {
         }
     } else if (type == GNEEvent_FileLoaded::Type::NETCCFG) {
         // declare parser for netedit config file
-        GNEApplicationWindowHelper::GNENetconvertConfigHandler confighandler(myApplicationWindow, loadedFile);
+        GNEApplicationWindowHelper::GNENetconvertConfigHandler confighandler(loadedFile);
         // if there is an error loading sumo config, stop
         if (!confighandler.loadNetconvertConfig()) {
             return submitEndAndCleanup(type, nullptr, loadedFile);