Merge pull request UCL-INGI#993 from AlexandreDoneux/pre-release_fixes

[ci] Fix ci by fixing setuptools and setuptools-scm version
AlexandreDoneux · Feb 21, 2024 · e531343 · e531343
2 parents 3453688 + 525c15a
commit e531343
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,10 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt-get install -y libtidy5deb1 libzmq3-dev
-          pip3 install coverage pytest virtualenv
+          pip3 install coverage==7.4.1 pytest==8.0.0 virtualenv==20.25.0
+          pip3 install setuptools==69.1.0 setuptools-scm==8.0.4
 
       - name: Start services
         run: |
@@ -37,17 +39,14 @@ jobs:
 
       - name: Install INGInious
         run: pip3 install .
-
-      - name: Mitigate MarkupSafe 2.1+ issues
-        run: pip3 install --upgrade markupsafe==2.0.1
 
       - name: Launch pytest tests
         run: coverage run --branch -m pytest -v
 
       - name: Launch pytest tests not requiring INGInious modules
         run: |
           virtualenv env
-          env/bin/pip3 install jinja2 pytest coverage
+          env/bin/pip3 install jinja2==3.1.3 pytest==8.0.0 coverage==7.4.1
           env/bin/coverage run --branch -m pytest -v utils
 
       - name: Generate coverage report

diff --git a/setup.py b/setup.py
@@ -9,40 +9,41 @@
 from setuptools import setup, find_packages
 
 install_requires = [
-    "docker==6.1.3",
-    "docutils==0.18.1",
-    "Flask==3.0.0",
+    "docker==7.0.0",
+    "docutils==0.20.1",
+    "Flask==3.0.2",
     "Flask-Mail==0.9.1",
     "itsdangerous==2.1.2",
-    "Jinja2==3.1.2",
+    "Jinja2==3.1.3",
     "lti==0.9.5",
     "msgpack==1.0.7",
     "natsort==8.4.0",
-    "psutil==5.9.6",
+    "psutil==5.9.8",
     "pymongo==4.6.1",
     "pytidylib==0.3.2",
     "PyYAML==6.0.1",
     "pyzmq==25.1.2",
     "requests-oauthlib==1.3.1",
     "sh==2.0.6",
-    "watchdog==3.0.0",
+    "watchdog==4.0.0",
     "Werkzeug==3.0.1",
+    "MarkupSafe==2.1.5",
     "WsgiDAV==4.3.0",
-    "zipstream==1.1.4"
+    "zipstream==1.1.4",
     "argon2-cffi == 23.1.0"
 ]
 
 test_requires = [
-    "pytest",
-    "coverage"
+    "pytest==8.0.0",
+    "coverage==7.4.1"
 ]
 
 doc_requires = [
-    "ipython==8.12.3",
-    "sphinx==7.1.2",
-    "sphinx-autodoc-typehints==1.25.2",
+    "ipython==8.21.0",
+    "sphinx==7.2.6",
+    "sphinx-autodoc-typehints==2.0.0",
     "sphinx-rtd-theme==2.0.0",
-    "sphinx-tabs==3.4.4"
+    "sphinx-tabs==3.4.5"
 ]
 
 scripts = [] if os.environ.get("INGINIOUS_COMPOSE") else [
@@ -68,10 +69,10 @@
     install_requires=install_requires,
     tests_require=test_requires,
     extras_require={
-        "cgi": ["flup>=1.0.3.dev"],
-        "ldap": ["ldap3"],
-        "saml2": ["python3-saml"],
-        "uwsgi": ["uwsgi"],
+        "cgi": ["flup==1.0.3"],
+        "ldap": ["ldap3==2.9.1"],
+        "saml2": ["python3-saml==1.16.0"],
+        "uwsgi": ["uwsgi==2.0.24"],
         "test": test_requires,
         "doc": test_requires + doc_requires
     },