Skip to content

Commit 289e230

Browse files
committed
chores(master): merge from master into working branch (reanahub#673)
2 parents e85e628 + e2cdbad commit 289e230

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204
205205
- name: Install Python dependencies
206206
run: |
207-
pip install --upgrade pip setuptools py
207+
pip install --upgrade pip 'setuptools<81' py
208208
pip install -e .[all]
209209
210210
- name: Run Sphinx documentation with doctests
@@ -223,7 +223,7 @@ jobs:
223223

224224
- name: Install Python dependencies
225225
run: |
226-
pip install --upgrade pip setuptools py
226+
pip install --upgrade pip 'setuptools<81' py
227227
pip install twine wheel
228228
pip install -e .[all]
229229

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ RUN apt-get update -y && \
3232
python3.12 \
3333
python3.12-dev \
3434
vim-tiny && \
35+
<<<<<<< HEAD
3536
pip install --no-cache-dir --upgrade "setuptools<81.0.0" && \
37+
=======
38+
pip install --no-cache-dir --upgrade 'setuptools<81' && \
39+
>>>>>>> master
3640
pip install --no-cache-dir -r /code/requirements.txt && \
3741
apt-get remove -y \
3842
gcc \

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# REANA is free software; you can redistribute it and/or modify it
55
# under the terms of the MIT License; see LICENSE file for more details.
66

7+
setuptools<81
78
-e .[all]

0 commit comments

Comments
 (0)