Merge pull request #161 from UIUCLibrary/dev

Dev
UIUCLibrary · Aug 13, 2024 · 692ae68 · 692ae68
2 parents b79409e + 94a9e8e
commit 692ae68
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,12 +51,14 @@ def getToxStages(){
                 },
                 'Windows':{
                     timeout(240){
+                        // Don't cache uv path here on windows because it keeps running into Access is denied errors on
+                        // windows
                         windowsJobs = getToxTestsParallel(
                                 envNamePrefix: 'Tox Windows',
                                 label: 'windows && docker && x86',
                                 dockerfile: 'ci/docker/windows/tox/Dockerfile',
                                 dockerArgs: '--build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/containeradministrator/appdata/local/pip --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv',
-                                dockerRunArgs: '-v pipcache_tesseractglue:c:/users/containeradministrator/appdata/local/pip -v uvcache_tesseractglue:c:/users/containeradministrator/appdata/local/uv',
+                                dockerRunArgs: '-v pipcache_tesseractglue:c:/users/containeradministrator/appdata/local/pip',
                                 retry: 2
                          )
                     }

diff --git a/ci/docker/linux/jenkins/Dockerfile b/ci/docker/linux/jenkins/Dockerfile
@@ -1,7 +1,7 @@
 ARG SONAR_SCANNER_VERSION=5.0.1.3006
 ARG PYTHON_VERSION=3.11
 ARG CONAN_USER_HOME=/conan
-ARG PIP_FIND_LINKS=/wheels/
+ARG PIP_FIND_LINKS=/wheels
 FROM python:${PYTHON_VERSION} AS base_python
 RUN apt-get update -y &&  \
     apt-get install -y --no-install-recommends ca-certificates git && \
@@ -26,8 +26,9 @@ ARG PIP_INDEX_URL
 COPY requirements-dev.txt /requirements/
 
 ARG PIP_FIND_LINKS
-RUN mkdir -p ${PIP_FIND_LINKS} &&  \
-    pip wheel --wheel-dir=${PIP_FIND_LINKS} --no-cache-dir -r /requirements/requirements-dev.txt
+RUN --mount=type=cache,target=/root/.cache/pip \
+    mkdir -p ${PIP_FIND_LINKS}/ &&  \
+    pip wheel --wheel-dir=${PIP_FIND_LINKS}/ --cache-dir /root/.cache/pip -r /requirements/requirements-dev.txt
 
 FROM base_python AS conan_builder
 ARG CONAN_USER_HOME
@@ -105,7 +106,7 @@ ARG PIP_EXTRA_INDEX_URL
 ARG PIP_TRUSTED_HOST
 COPY --from=wheel_builder ${PIP_FIND_LINKS}/* ${PIP_FIND_LINKS}/
 COPY --from=wheel_builder requirements/ /requirements
-RUN pip install --no-index --no-cache-dir --find-links=${PIP_FIND_LINKS} \
+RUN pip install --no-index --no-cache-dir --find-links=${PIP_FIND_LINKS}/ \
     -r /requirements/requirements-dev.txt
 
 ARG CONAN_USER_HOME

diff --git a/ci/docker/linux/tox/Dockerfile b/ci/docker/linux/tox/Dockerfile
@@ -30,7 +30,7 @@ COPY conanfile.py /tmp/conanfile.py
 COPY ci/docker/linux/tox/update_conan_compiler.py  /tmp/update_conan_compiler.py
 RUN python3 -m venv venv --upgrade-deps && \
      . ./venv/bin/activate && \
-    pip install pip uv --upgrade && \
+    pip install $(grep "^uv==" /tmp/requirements/requirements-dev.txt) && \
     uv pip install --no-cache-dir  -r /tmp/requirements/requirements-dev.txt && \
     conan config init && \
     conan config set general.revisions_enabled=1 && \

diff --git a/ci/docker/windows/tox/Dockerfile b/ci/docker/windows/tox/Dockerfile
@@ -94,7 +94,7 @@ COPY ci/docker/windows/tox/conan/profile.ini  ${CONAN_USER_HOME}/.conan/profiles
 
 RUN python -m venv venv --upgrade-deps; `
     .\\venv\\Scripts\\activate.ps1 ; `
-    pip install uv --no-cache-dir; `
+    pip install $(Select-String "^uv==" c:/requirements/requirements-dev.txt).Line --no-cache-dir; `
     uv pip install -r c:/requirements/requirements-dev.txt --no-cache-dir; `
     conan config init ; `
     conan config set general.revisions_enabled=1 ; `

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,7 @@ alabaster==0.7.13
     # via sphinx
 astroid==3.2.4
     # via pylint
-babel==2.15.0
+babel==2.16.0
     # via sphinx
 backports-tarfile==1.2.0
     # via jaraco-context
@@ -87,7 +87,7 @@ jinja2==3.1.4
     #   sphinx
 keyring==25.3.0
     # via twine
-lxml==5.2.2
+lxml==5.3.0
     # via
     #   -r requirements/requirements-dev.txt
     #   gcovr
@@ -243,7 +243,7 @@ tomli==2.0.1
     #   tox
 tomlkit==0.13.0
     # via pylint
-tox==4.17.0
+tox==4.17.1
     # via
     #   -r requirements/requirements-tox.txt
     #   tox-uv
@@ -260,22 +260,22 @@ typing-extensions==4.12.2
     #   pylint
     #   rich
     #   tox-uv
-uiucprescon-build @ git+https://github.com/UIUCLibrary/uiucprescon_build.git@496c6c52d7135c36c4e8df14b3e5720485611182
+uiucprescon.build @ git+https://github.com/UIUCLibrary/uiucprescon_build.git@v0.1.0
     # via -r requirements/requirements-dev.txt
 urllib3==1.26.19
     # via
     #   conan
     #   requests
     #   twine
-uv==0.2.33
+uv==0.2.35
     # via tox-uv
 virtualenv==20.26.3
     # via tox
 wheel==0.44.0
     # via
     #   -r requirements/requirements-extras.txt
     #   uiucprescon-build
-zipp==3.19.2
+zipp==3.20.0
     # via
     #   importlib-metadata
     #   importlib-resources