Merge pull request #2909 from alicevision/fix/reloadPluginEnv

[core] plugins: Do not use Python 3.10-and-over syntax

Author: servantftransperfect

.github/workflows/continuous-integration.yml

@@ -18,6 +18,7 @@ on:
 
 env:
   CI: True
+  PYTHONPATH: ${{ github.workspace }}
 
 jobs:
   build-linux:
@@ -56,6 +57,17 @@ jobs:
       uses: codecov/test-results-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Set up Python 3.9 - meshroom_compute test
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
+    - name: Install dependencies (Python 3.9) - meshroom_compute test
+      run: |
+        python3.9 -m pip install --upgrade pip
+        python3.9 -m pip install -r requirements.txt --timeout 45
+    - name: Run imports - meshroom_compute test
+      run: |
+        python3.9 bin/meshroom_compute -h
 
   build-windows:
     runs-on: windows-latest
@@ -83,3 +95,14 @@ jobs:
       - name: Test with pytest
         run: |
           pytest tests/
+      - name: Set up Python 3.9 - meshroom_compute test
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+      - name: Install dependencies (Python 3.9) - meshroom_compute test
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r requirements.txt --timeout 45
+      - name: Run imports - meshroom_compute test
+        run: |
+          python3 bin/meshroom_compute -h

meshroom/core/plugins.py

@@ -188,19 +188,18 @@ def resolveRezSubrequires(self) -> list[str]:
         # in the current environment (if they are resolved in it)
         for package in subrequires:
             packageTuple = self.REZ_DELIMITER_PATTERN.split(package, maxsplit=1)
-            match len(packageTuple):
-                case 1:
-                    # Only the package name in the subrequires.
-                    # Search for a corresponding version in the parent environment.
-                    packageName = packageTuple[0]
-                    parentResolvedVersion = resolvedVersions.get(packageName)
-                    if parentResolvedVersion:
-                        packages.append(f"{packageName}=={parentResolvedVersion}")
-                    else:
-                        packages.append(package)
-                case 2:
-                    # The subrequires ask for a specific version
+            if len(packageTuple) == 1:
+                # Only the package name in the subrequires.
+                # Search for a corresponding version in the parent environment.
+                packageName = packageTuple[0]
+                parentResolvedVersion = resolvedVersions.get(packageName)
+                if parentResolvedVersion:
+                    packages.append(f"{packageName}=={parentResolvedVersion}")
+                else:
                     packages.append(package)
+            elif len(packageTuple) == 2:
+                # The subrequires ask for a specific version
+                packages.append(package)
 
         def extractPackageName(packageString: str) -> str:
             return self.REZ_DELIMITER_PATTERN.split(packageString, maxsplit=1)[0]