Skip to content

Commit b74c54b

Browse files
committed
Unconditionally install setuptools on CI
1 parent 7923b16 commit b74c54b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/eb_command.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ jobs:
3535
# update to latest pip, check version
3636
pip install --upgrade pip
3737
pip --version
38-
if ! python -c "import distutils" 2> /dev/null; then
39-
# we need setuptools for distutils in Python 3.12+, needed for python setup.py sdist
40-
pip install --upgrade setuptools
41-
fi
38+
pip install setuptools
4239
4340
# for modules tool
4441
APT_PKGS="lua5.3 liblua5.3-dev lua-filesystem lua-posix tcl tcl-dev"

.github/workflows/unit_tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ jobs:
8484
pip install --upgrade pip
8585
pip --version
8686
pip install -r requirements.txt
87-
if ! python -c "import distutils" 2> /dev/null; then
88-
# we need setuptools for distutils in Python 3.12+, needed for python setup.py sdist
89-
pip install --upgrade setuptools
90-
fi
87+
pip install setuptools
88+
9189
# git config is required to make actual git commits (cfr. tests for GitRepository)
9290
git config --global user.name "Github Actions"
9391
git config --global user.email "actions@github.com"

0 commit comments

Comments
 (0)