From 42d9f546f06aa605fb78c5181f7746dad6570ef3 Mon Sep 17 00:00:00 2001 From: Benjamin Hugo Date: Fri, 29 Nov 2024 09:36:43 +0200 Subject: [PATCH] Work around upstream breakage due to pypa/setuptools#4483 --- {.travis => .ci}/mypy.docker | 0 {.travis => .ci}/pep8.docker | 0 {.travis => .ci}/py3.docker | 2 +- Jenkinsfile.sh | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {.travis => .ci}/mypy.docker (100%) rename {.travis => .ci}/pep8.docker (100%) rename {.travis => .ci}/py3.docker (95%) diff --git a/.travis/mypy.docker b/.ci/mypy.docker similarity index 100% rename from .travis/mypy.docker rename to .ci/mypy.docker diff --git a/.travis/pep8.docker b/.ci/pep8.docker similarity index 100% rename from .travis/pep8.docker rename to .ci/pep8.docker diff --git a/.travis/py3.docker b/.ci/py3.docker similarity index 95% rename from .travis/py3.docker rename to .ci/py3.docker index 8e8c5a4..047eff2 100644 --- a/.travis/py3.docker +++ b/.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 index 06555f6..c216ea5 100644 --- 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 .