CI: devpi is installed vi pipx in jenkins Dockerfiles

UIUCLibrary · Oct 9, 2023 · ddba4dc · ddba4dc
1 parent db0c8be
commit ddba4dc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/ci/docker/linux/tox/Dockerfile b/ci/docker/linux/tox/Dockerfile
@@ -1,3 +1,4 @@
+ARG PIPX_HOME=/pipx
 ARG CONAN_USER_HOME=/conan
 ARG PIP_DOWNLOAD_CACHE=/.cache/pip
 FROM ubuntu:22.04
@@ -30,5 +31,16 @@ RUN conan config init && \
     python3 /tmp/update_conan_compiler.py ${CONAN_USER_HOME}/.conan/settings.yml gcc $(cc -dumpfullversion -dumpversion | grep -oE  "^([0-9]+(\.)?)([0-9]+?)")
 ENV CONAN_USER_HOME=${CONAN_USER_HOME}
 
+
+ARG PIPX_HOME
+ENV PIPX_HOME=${PIPX_HOME}
+ENV PIPX_BIN_DIR=${PIPX_HOME}/bin
+RUN python3 -m pip install --no-cache-dir pipx && \
+    pipx ensurepath && \
+    mkdir -p $PIPX_HOME  && chmod -R 777 $PIPX_HOME
+
+RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install 'devpi-client<7.0'
+
+
 WORKDIR /src
 CMD tox --workdir /tmp/tox --recreate
diff --git a/ci/docker/windows/tox/Dockerfile b/ci/docker/windows/tox/Dockerfile
@@ -1,4 +1,5 @@
 # escape=`
+ARG PIPX_HOME=c:\pipx
 ARG VS_INSTALL_PATH="C:\BuildTools\"
 ARG PIP_EXTRA_INDEX_URL
 ARG PIP_INDEX_URL
@@ -121,6 +122,16 @@ COPY requirements/ c:/python_requirements/requirements
 RUN python -m pip install pip --upgrade ; `
     pip install wheel ; `
     pip install -r c:\python_requirements\requirements-ci.txt
+
+ARG PIPX_HOME
+ENV PIPX_HOME=${PIPX_HOME}
+ENV PIPX_BIN_DIR=${PIPX_HOME}\bin
+
+
+RUN py -3 -m pip install --no-cache-dir pipx ; `
+    py -3 -m pipx ensurepath
+RUN py -3 -m pipx install 'devpi-client<7.0'
+
 ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
 ENV PIP_INDEX_URL=${PIP_INDEX_URL}
 WORKDIR C:/src

diff --git a/requirements/requirements-ci-freeze.txt b/requirements/requirements-ci-freeze.txt
@@ -2,48 +2,37 @@ alabaster==0.7.13
 astroid==3.0.0
 Babel==2.13.0
 bottle==0.12.25
-build==1.0.3
 certifi==2023.7.22
 charset-normalizer==3.3.0
-check-manifest==0.49
 colorama==0.4.6
 conan==1.61.0
 coverage==7.3.2
-devpi-client==5.2.3
-devpi-common==3.7.2
 dill==0.3.7
-distlib==0.3.7
 docutils==0.20.1
 fasteners==0.19
-filelock==3.12.4
 flake8==6.1.0
 idna==3.4
 imagesize==1.4.1
 iniconfig==2.0.0
 isort==5.12.0
 Jinja2==3.1.2
-lazy==1.6
 lxml==4.9.3
 MarkupSafe==2.1.3
 mccabe==0.7.0
 mypy==1.5.1
 mypy-extensions==1.0.0
 node-semver==0.6.1
-packaging==21.3
+packaging==23.2
 patch-ng==1.17.4
-pkginfo==1.9.6
 platformdirs==3.11.0
 pluggy==1.3.0
 pluginbase==1.0.1
-py==1.11.0
 pybind11==2.11.1
 pycodestyle==2.11.0
 pyflakes==3.1.0
 Pygments==2.16.1
 PyJWT==2.8.0
 pylint==3.0.1
-pyparsing==3.1.1
-pyproject_hooks==1.0.0
 pytest==7.4.2
 python-dateutil==2.8.2
 PyYAML==6.0.1
@@ -59,8 +48,6 @@ sphinxcontrib-qthelp==1.0.6
 sphinxcontrib-serializinghtml==1.1.9
 toml==0.10.2
 tomlkit==0.12.1
-tox==3.28.0
 tqdm==4.66.1
 typing_extensions==4.8.0
 urllib3==1.26.17
-virtualenv==20.24.5
diff --git a/requirements/requirements-ci.txt b/requirements/requirements-ci.txt
@@ -1 +0,0 @@
-devpi-client<6.0