ci: improved ci pipeline; added 3.9 and 3.10 tests

.gitlab-ci.yml

@@ -1,5 +1,13 @@
 stages:
   - Test
+  - AdditionalTests
+
+.install-grum-test: &install-grum-test
+    - pip install pytest pytest-random-order pytest-cov
+    - pip install -e ./
+
+    - apt-get update
+    - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6
 
 tests:
   stage: Test
@@ -8,15 +16,8 @@ tests:
     XDG_RUNTIME_DIR: "/tmp/runtime-root"
 
   script:
-    - pip install pytest pytest-random-order pytest-cov
+    - *install-grum-test
-    - pip install -e ./
-    - pip install PyQtWebEngine
 
-    - apt-get update
-    - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6
-
-#    - python -m unittest discover -f ./tests
-#    - coverage run --source=./grum -m unittest discover -f ./tests
     - coverage run --source=./grum -m pytest ./tests
     - coverage report
     - coverage xml
@@ -26,4 +27,20 @@ tests:
     reports:
       cobertura: coverage.xml
 
+tests-3.9:
+  stage: AdditionalTests
+  image: python:3.9
+  needs: ["tests"]
+  allow_failure: true
+  variables:
+    QT_QPA_PLATFORM: "offscreen"
+    XDG_RUNTIME_DIR: "/tmp/runtime-root"  
+  script: 
+    - *install-grum-test
+    - pytest ./tests
 
+tests-3.10:
+  extends: "tests-3.9"
+  stage: AdditionalTests
+  image: python:3.10
+  allow_failure: true

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 if __name__ == "__main__":
     setup(
-        install_requires=["pyqt5", "pyqtgraph", "h5py"],
+        install_requires=["pyqt5", "pyqtgraph", "h5py", "PyQtWebEngine"],
         entry_points={"console_scripts": ["grum=grum:main"]},
     )