Merge pull request #1 from bennahugo/workaround#4483

Work around upstream breakage due to pypa/setuptools#4483
ratt-ru · Nov 29, 2024 · 0ae1a5d · 0ae1a5d
2 parents 1e97f69 + 42d9f54
commit 0ae1a5d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/.travis/mypy.docker → .ci/mypy.docker b/.travis/mypy.docker → .ci/mypy.docker
diff --git a/.travis/pep8.docker → .ci/pep8.docker b/.travis/pep8.docker → .ci/pep8.docker
diff --git a/.travis/py3.docker → .ci/py3.docker b/.travis/py3.docker → .ci/py3.docker
@@ -5,7 +5,7 @@ RUN docker-apt-install python3-casacore casacore-dev casacore-data makems casare
                        libfftw3-dev wcslib-dev libcfitsio-dev \
                        'libcasa-*' liblapack-dev libatlas-base-dev 2to3
 
-RUN pip install -U pip setuptools wheel
+RUN pip install -U pip 'setuptools[core]' wheel
 #######################################
 # Install python 3 meqtrees
 #######################################

diff --git a/Jenkinsfile.sh b/Jenkinsfile.sh
@@ -21,4 +21,4 @@ cd $PROJECTS_DIR/meqtrees-tigger-lsm
 IMAGENAME="mttiglsmpr"
 
 # build and test
-docker build -f .travis/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true .
+docker build -f .ci/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true .