Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MAINT] Deprecate distutils in favor of setuptools #635

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
pip install -e .
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
pip install -r requirements_all.txt
pip install pytest pytest-cov
- name: Run tests
Expand All @@ -55,7 +55,7 @@ jobs:
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
pip install flake8
- name: Lint with flake8
run: |
Expand All @@ -76,7 +76,7 @@ jobs:
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
pip install pytest pytest-cov
- name: Install POT
run: |
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
pip install -e .
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools
pip install -r requirements_all.txt
pip install pytest
- name: Run tests
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_tests_cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
- uses: actions/checkout@v4
- name: Install POT
run: |
python3.10 -m pip install --ignore-installed -e .
python3.10 -m pip install --upgrade pip setuptools
python3.10 -m pip install --ignore-installed -e .
- name: Run tests
run: |
python3.10 -m pytest --durations=20 -v test/ ot/ --doctest-modules --color=yes --ignore=test/test_dr.py --ignore=ot.dr --ignore=ot.plot
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools

- name: Install cibuildwheel
run: |
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools

- name: Install cibuildwheel
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels_weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade pip setuptools

- name: Install cibuildwheel
run: |
Expand Down
2 changes: 1 addition & 1 deletion ot/helpers/openmp_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import textwrap
import subprocess

from distutils.errors import CompileError, LinkError
from setuptools.errors import CompileError, LinkError

from pre_build_helpers import compile_test_program

Expand Down
Loading