Migrate to UV & fix some tests

.github/workflows/cdkactions_build-and-deploy.yaml

@@ -12,27 +12,30 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.local/share/virtualenvs
-          key: v0-${{ hashFiles('backend/Pipfile.lock') }}
+          key: v0-${{ hashFiles('backend/uv.lock') }}
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.4.30"
       - name: Install Dependencies
         run: |-
           cd backend
-          pip install pipenv
-          pipenv install --deploy --dev
+          uv sync
       - name: Lint (flake8)
         run: |-
           cd backend
-          pipenv run flake8 .
+          uv run flake8 .
       - name: Lint (black)
         run: |-
           cd backend
-          pipenv run black --check .
+          uv run black --check .
       - name: Test (run in parallel)
         run: |-
           cd backend
-          pipenv run python -m coverage run --concurrency=multiprocessing manage.py test --settings=Platform.settings.ci --parallel
-          pipenv run python -m coverage combine
+          uv run python -m coverage run --concurrency=multiprocessing manage.py test --settings=Platform.settings.ci --parallel
+          uv run python -m coverage combine
     container:
-      image: python:3.10-buster
+      image: python:3.11-bookworm
     env:
       DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres
     services:

backend/Dockerfile

@@ -17,17 +17,32 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# Install uv
+# Download the latest installer
+ADD https://astral.sh/uv/0.6.0/install.sh /uv-installer.sh
+
+RUN echo "5464b06094b6363861b99cd60a010892e52fc2a7503b7594419828e74afecfe6  /uv-installer.sh" | sha256sum -c
+
+# Run the installer then remove it
+RUN sh /uv-installer.sh && rm /uv-installer.sh
+
+# Ensure the installed binary is on the `PATH`
+ENV PATH="/root/.local/bin/:$PATH"
+
+#RUN curl -LsSf https://astral.sh/uv/0.4.30/install.sh | sh
+
 # Copy config files
 COPY docker/shibboleth/ /etc/shibboleth/
 COPY docker/nginx-default.conf /etc/nginx/conf.d/default.conf
 COPY docker/shib_clear_headers /etc/nginx/
 COPY docker/supervisord.conf /etc/supervisor/
 
 # Copy project dependencies
-COPY Pipfile* /app/
+COPY pyproject.toml /app/
+COPY uv.lock /app/
 
 # Install project dependencies
-RUN pipenv install --deploy --system
+RUN cd /app/ && uv sync
 
 # Copy project files
 COPY . /app/
@@ -38,7 +53,7 @@ ENV IDENTITY_RSA_PRIVATE_KEY 'temporary private key just to build the docker ima
 ENV OIDC_RSA_PRIVATE_KEY 'temporary private key just to build the docker image'
 
 # Collect static files
-RUN python3 /app/manage.py collectstatic --noinput
+RUN uv run /app/manage.py collectstatic --noinput
 
 # Copy mime definitions
 COPY docker/mime.types /etc/mime.types

backend/Dockerfile.dev

@@ -2,11 +2,30 @@ FROM pennlabs/django-base:b269ea1613686b1ac6370154debbb741b012de1a-3.11
 
 LABEL maintainer="Penn Labs"
 
+# Install dependencies
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install uv
+# Download the latest installer
+ADD https://astral.sh/uv/0.6.0/install.sh /uv-installer.sh
+
+RUN echo "5464b06094b6363861b99cd60a010892e52fc2a7503b7594419828e74afecfe6  /uv-installer.sh" | sha256sum -c
+
+# Run the installer then remove it
+RUN sh /uv-installer.sh && rm /uv-installer.sh
+
+# Ensure the installed binary is on the `PATH`
+ENV PATH="/root/.local/bin/:$PATH"
+
 # Copy project dependencies
-COPY Pipfile* /app/
+COPY pyproject.toml /app/
+COPY uv.lock /app/
 
 # Install project dependencies
-RUN pipenv install --system
+RUN cd /app/ && uv sync
 
 # Copy project files
 COPY . /app/
@@ -15,4 +34,4 @@ ENV DJANGO_SETTINGS_MODULE Platform.settings.staging
 ENV SECRET_KEY 'temporary key just to build the docker image'
 
 # Collect static files
-RUN python3 /app/manage.py collectstatic --noinput
+RUN uv run /app/manage.py collectstatic --noinput