Skip to content

Commit 08b7f90

Browse files
[CI] Ensure setuptools installed for tests
* To ensure that setuptools is available for setuptools.errors install it for all the tests in the CI. - setuptools.errors was added in v60.0.0 - c.f. https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html
1 parent 49fd909 commit 08b7f90

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/build_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
pip install -e .
3636
- name: Install dependencies
3737
run: |
38-
python -m pip install --upgrade pip
38+
python -m pip install --upgrade pip setuptools
3939
pip install -r requirements.txt
4040
pip install pytest pytest-cov
4141
- name: Run tests
@@ -55,7 +55,7 @@ jobs:
5555
python-version: "3.10"
5656
- name: Install dependencies
5757
run: |
58-
python -m pip install --upgrade pip
58+
python -m pip install --upgrade pip setuptools
5959
pip install flake8
6060
- name: Lint with flake8
6161
run: |
@@ -76,7 +76,7 @@ jobs:
7676
python-version: "3.10"
7777
- name: Install dependencies
7878
run: |
79-
python -m pip install --upgrade pip
79+
python -m pip install --upgrade pip setuptools
8080
pip install pytest pytest-cov
8181
- name: Install POT
8282
run: |
@@ -107,7 +107,7 @@ jobs:
107107
pip install -e .
108108
- name: Install dependencies
109109
run: |
110-
python -m pip install --upgrade pip
110+
python -m pip install --upgrade pip setuptools
111111
pip install -r requirements.txt
112112
pip install pytest
113113
- name: Run tests

.github/workflows/build_tests_cuda.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- name: Install POT
1717
run: |
18-
python3.10 -m pip install --ignore-installed -e .
18+
python3.10 -m pip install --upgrade pip setuptools
19+
python3.10 -m pip install --ignore-installed -e .
1920
- name: Run tests
2021
run: |
2122
python3.10 -m pytest --durations=20 -v test/ ot/ --doctest-modules --color=yes --ignore=test/test_dr.py --ignore=ot.dr --ignore=ot.plot

.github/workflows/build_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Install dependencies
2828
run: |
29-
python -m pip install --upgrade pip
29+
python -m pip install --upgrade pip setuptools
3030
3131
- name: Install cibuildwheel
3232
run: |
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Install dependencies
6363
run: |
64-
python -m pip install --upgrade pip
64+
python -m pip install --upgrade pip setuptools
6565
6666
- name: Install cibuildwheel
6767
run: |

.github/workflows/build_wheels_weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Install dependencies
2727
run: |
28-
python -m pip install --upgrade pip
28+
python -m pip install --upgrade pip setuptools
2929
3030
- name: Install cibuildwheel
3131
run: |

0 commit comments

Comments
 (0)