Skip to content

Commit

Permalink
[ci] Fix ci by fixing setuptools and setuptools-scm version
Browse files Browse the repository at this point in the history
[ci] removing python version

[ci] fixing concatened dependencies (install_requirements and scm)

[ci] Putting back wrongly deleted services start

[ci] Fixing ci beceause setuptools and setuptools-scm incompatible versions
  • Loading branch information
AlexandreDoneux committed Feb 12, 2024
1 parent 3453688 commit cb851e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 setuptools==69.1.0 setuptools-scm==8.0.4
- name: Start services
run: |
Expand All @@ -37,9 +39,6 @@ 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
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
"sh==2.0.6",
"watchdog==3.0.0",
"Werkzeug==3.0.1",
"MarkupSafe==2.1.1",
"WsgiDAV==4.3.0",
"zipstream==1.1.4"
"zipstream==1.1.4",
"argon2-cffi == 23.1.0"
]

Expand Down

0 comments on commit cb851e3

Please sign in to comment.