Merge pull request #92 from UIUCLibrary/dev

Dev

Jenkinsfile

@@ -776,7 +776,7 @@ pipeline {
                                                                 script: '''python3 -m venv venv
                                                                            . venv/bin/activate
                                                                            python -m pip install pip --upgrade
-                                                                           python -m pip install devpi_client -r requirements/requirements_tox.txt
+                                                                           python -m pip install 'devpi-client<7.0' -r requirements/requirements_tox.txt
                                                                         '''
                                                             )
                                                         },
@@ -813,7 +813,7 @@ pipeline {
                                                                 script: '''python3 -m venv venv
                                                                            . venv/bin/activate
                                                                            python -m pip install pip --upgrade
-                                                                           python -m pip install devpi_client -r requirements/requirements_tox.txt
+                                                                           python -m pip install 'devpi-client<7.0' -r requirements/requirements_tox.txt
                                                                         '''
                                                             )
                                                         },

ci/docker/python/linux/tox/Dockerfile

@@ -1,3 +1,4 @@
+ARG PIPX_HOME=/pipx
 ARG PIP_DOWNLOAD_CACHE=/.cache/pip
 FROM ubuntu:22.04 AS wheel_builder_base
 COPY ci/docker/python/linux/tox/apt-packages.txt /tmp/
@@ -20,5 +21,15 @@ ENV PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}
 COPY requirements-ci.txt /tmp/python_requirements/
 COPY requirements/ /tmp/python_requirements/requirements/
 RUN python3 -m pip install --no-cache-dir pip --upgrade && pip3 install --no-cache-dir -r /tmp/python_requirements/requirements-ci.txt
+
+ARG PIPX_HOME
+ENV PIPX_HOME=${PIPX_HOME}
+ENV PIPX_BIN_DIR=${PIPX_HOME}/bin
+RUN pip3 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' &&  \
+    PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install pip-audit
+
 WORKDIR /src
 CMD ["tox", "--workdir", "/tmp/tox", "--recreate"]

ci/docker/python/windows/tox/Dockerfile

@@ -1,5 +1,5 @@
 # escape=`
-
+ARG PIPX_HOME=c:\pipx
 ARG FROM_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8
 ARG PIP_DOWNLOAD_CACHE=c:/users/containeradministrator/appdata/local/pip
 FROM ${FROM_IMAGE} AS base_image
@@ -67,5 +67,13 @@ ARG PIP_DOWNLOAD_CACHE
 RUN New-Item -type directory -path ${Env:PIP_DOWNLOAD_CACHE} -Force
 ENV PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}
 
+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'
+
 WORKDIR C:/src
 CMD ["tox", "--workdir", "${Env:TEMP}\\tox\\", "-vv",  "--recreate"]

requirements-ci.txt

@@ -1,6 +1,5 @@
 -r requirements/requirements.txt
 -r requirements/requirements_tox.txt
--r requirements/requirements-devpi.txt
 -r requirements/requirements-dev.txt
 -r requirements/requirements-ci.txt
 -r requirements/requirements-ci-freeze.txt

requirements/requirements-ci-freeze.txt

@@ -1,74 +1,72 @@
 alabaster==0.7.13
-astroid==3.0.0
-Babel==2.13.0
+astroid==3.0.1
+Babel==2.13.1
 bcrypt==4.0.1
-build==1.0.3
+cachetools==5.3.2
 certifi==2023.7.22
 cffi==1.16.0
-charset-normalizer==3.3.0
-check-manifest==0.49
+chardet==5.2.0
+charset-normalizer==3.3.1
+colorama==0.4.6
 coverage==7.3.2
-cryptography==41.0.4
-devpi-client==6.0.5
-devpi-common==3.7.2
+cryptography==41.0.5
 dill==0.3.7
 distlib==0.3.7
 docutils==0.20.1
-filelock==3.12.4
+exceptiongroup==1.1.3
+filelock==3.13.1
 flake8==6.1.0
 idna==3.4
 imagesize==1.4.1
 importlib-metadata==6.8.0
+importlib-resources==6.1.0
 iniconfig==2.0.0
 isort==5.12.0
 jaraco.classes==3.3.0
 Jinja2==3.1.2
 keyring==24.2.0
-lazy==1.6
 lxml==4.9.3
 markdown-it-py==3.0.0
 MarkupSafe==2.1.3
 mccabe==0.7.0
 mdurl==0.1.2
 more-itertools==10.1.0
-mypy==1.5.1
+mypy==1.6.1
 mypy-extensions==1.0.0
 nh3==0.2.14
-packaging==21.3
+packaging==23.2
 paramiko==3.3.1
-pep517==0.13.0
 pkginfo==1.9.6
 platformdirs==3.11.0
 pluggy==1.3.0
-py==1.11.0
-pycodestyle==2.11.0
+pycodestyle==2.11.1
 pycparser==2.21
 pyflakes==3.1.0
 Pygments==2.16.1
-pylint==3.0.0
+pylint==3.0.2
 PyNaCl==1.5.0
-pyparsing==3.1.1
-pyproject_hooks==1.0.0
-pytest==7.4.2
+pyproject-api==1.6.1
+pytest==7.4.3
 pytest-runner==6.0.0
+pytz==2023.3.post1
 readme-renderer==42.0
 requests==2.31.0
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
 rich==13.6.0
-six==1.16.0
 snowballstemmer==2.2.0
-Sphinx==7.2.6
-sphinxcontrib-applehelp==1.0.7
-sphinxcontrib-devhelp==1.0.5
-sphinxcontrib-htmlhelp==2.0.4
+Sphinx==7.1.2
+sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.1
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.6
-sphinxcontrib-serializinghtml==1.1.9
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5
+tomli==2.0.1
 tomlkit==0.12.1
-tox==3.28.0
+tox==4.11.3
 twine==4.0.2
 typing_extensions==4.8.0
-urllib3==2.0.6
-virtualenv==20.24.5
+urllib3==2.0.7
+virtualenv==20.24.6
 zipp==3.17.0

requirements/requirements-ci.txt

@@ -1,4 +1,3 @@
-devpi-client
 paramiko
 pylint
 twine

requirements/requirements_tox.txt

@@ -1 +1 @@
-tox<4.0
+tox