Merge branch 'mr/ramonat/fix-github-ci' into 'master'

Fix GitHub CI

See merge request it/e3-core!92

.github/workflows/ci.yaml

@@ -11,7 +11,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python: ["3.9", "3.10", "3.11", "3.12"]
+        python: ["3.12"]
+        include:
+          - os: ubuntu-latest
+            python: "3.9"
+          - os: ubuntu-latest
+            python: "3.10"
+          - os: ubuntu-latest
+            python: "3.11"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -28,10 +35,15 @@ jobs:
              mkdir C:/tmp/Trash
              echo "$ENV:ProgramFiles/Git/usr/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         if: runner.os == 'Windows'
-      - name: Run Tox
-        run: tox
-        env:
-            TOXENV: py${{ matrix.python-version}}-xdist-cov
+      - name: Run Tox on Linux
+        # Pass the right version of Python to Tox, e.g. 311 for Python 3.11
+        run: |
+             pyversion="${{ matrix.python }}"
+             tox -e py${pyversion/./}-xdist-cov
+        if: runner.os == 'Linux'
+      - name: Run Tox on Windows
+        run: tox -e py-xdist-cov
+        if: runner.os == 'Windows'
 
   security:
     runs-on: ubuntu-latest

tests/tests_e3/conftest.py

@@ -8,7 +8,7 @@
 import shutil
 import os
 from e3.fs import mkdir, cp
-from e3.os.fs import touch
+from e3.os.fs import touch, which
 from e3.python.wheel import Wheel
 
 import pytest
@@ -21,7 +21,14 @@
 
 git = require_tool("git")
 ldd = require_tool("ldd")
-svn = require_tool("svn")
+
+
+def svn_wrapper(request: pytest.FixtureRequest) -> None:
+    if not which("svn"):
+        pytest.skip("svn is not available")
+
+
+svn = pytest.fixture(svn_wrapper)
 
 
 class PypiSimulator: