Merge pull request #55 from steder/claude/dependabot-updates-modernize-WbEUJ

Migrate to uv and apply pending Dependabot bumps

Author: steder

.github/python-app.yml

@@ -0,0 +1,33 @@
+name: Python application
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install ImageMagick
+      run: sudo apt-get update && sudo apt-get install -y imagemagick libmagickwand-dev
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        python-version: "3.13"
+    - name: Install dependencies
+      run: uv sync --all-groups --frozen
+    - name: Lint with flake8
+      run: |
+        uv run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.venv,.git,__pycache__
+        uv run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude=.venv,.git,__pycache__
+    - name: Test with pytest
+      run: uv run pytest

.github/workflows/python-app.yml

@@ -1,4 +1,6 @@
 .tox
 __pycache__
 .coverage
-requirements.pypy.txt
+.venv
+.pytest_cache
+*.egg-info

.gitignore

@@ -1,41 +1,38 @@
-FROM python:3.13-slim as builder
+FROM python:3.13-slim AS builder
 
-# metadata
-MAINTAINER steder@gmail.com
-LABEL version="1.0"
+LABEL org.opencontainers.image.authors="steder@gmail.com"
+LABEL version="2.0"
 
-ENV ENV=development
+ENV ENV=development \
+    UV_LINK_MODE=copy \
+    UV_COMPILE_BYTECODE=1 \
+    UV_PYTHON_DOWNLOADS=never
 
-# actual container setup:
 RUN apt-get update \
     && apt-get -y upgrade \
     && apt-get install -y --no-install-recommends \
         build-essential \
         imagemagick \
         git \
-    && pip install poetry \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-FROM builder as giraffe
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
 
-# Giraffe listens on 9876 by default
-EXPOSE 9876
+FROM builder AS giraffe
 
-# let's get the code!
+EXPOSE 9876
 
 WORKDIR /opt/app
 
-COPY pyproject.toml poetry.lock /opt/app/
-RUN poetry install --no-root --without=dev
+COPY pyproject.toml uv.lock /opt/app/
+RUN uv sync --frozen --no-dev --no-install-project
 
 COPY . /opt/app
 
-RUN poetry install --without=dev
-
-CMD ["poetry", "run", "gunicorn", "-k", "uvicorn.workers.UvicornWorker", "-c", "etc/gunicorn.conf.py", "giraffe:app", "--log-level=DEBUG"]
+CMD ["uv", "run", "--no-dev", "gunicorn", "-k", "uvicorn.workers.UvicornWorker", "-c", "etc/gunicorn.conf.py", "giraffe:app", "--log-level=DEBUG"]
 
-FROM giraffe as dev
-RUN poetry install
+FROM giraffe AS dev
+RUN uv sync --frozen
 
-CMD ["poetry", "run", "python", "/opt/app/giraffe.py"]
+CMD ["uv", "run", "python", "/opt/app/giraffe.py"]

.travis.yml

@@ -8,7 +8,7 @@ More specifically, this started out as something to help out the design team and
 
 Instead, we moved to uploading original images to S3 and letting the resizing, overlays, etc happen dynamically in Giraffe.
 
-![travis ci build status](https://travis-ci.org/steder/giraffe.png)
+![python application build status](https://github.com/steder/giraffe/actions/workflows/python-app.yml/badge.svg)
 
 ## Why call it Giraffe?
 
@@ -96,8 +96,9 @@ Supported params:
 ### Dependencies
 
 At a system level you'll need:
- - `Python` (3.7+, or pypy3)
+ - `Python` 3.13+
  - `ImageMagick` (remember to use `--with-liblqr` if you want to be able to use content-aware resizing)
+ - [`uv`](https://docs.astral.sh/uv/) for managing the Python environment and dependencies
 
 For deployment with Gunicorn you may also want `libev`.
 
@@ -111,14 +112,14 @@ You need to set the following environment variables for giraffe to work properly
 ### Development
 
 ```
-mkvirtualenv giraffe
-pip install -r requirements.txt
+uv sync --all-groups
+uv run python giraffe.py
 ```
 
 #### Testing
 
 ```
-pytest
+uv run pytest
 ```
 
 ### Deployment

Dockerfile

@@ -26,13 +26,13 @@ if [ -e $ROOT/conf.sh ]; then
 fi
 
 # Option 1: Gunicorn with Uvicorn workers (Recommended for production)
-# poetry run newrelic-admin run-program gunicorn -k uvicorn.workers.UvicornWorker -c etc/gunicorn.conf.py giraffe:app --log-level=DEBUG
+# uv run newrelic-admin run-program gunicorn -k uvicorn.workers.UvicornWorker -c etc/gunicorn.conf.py giraffe:app --log-level=DEBUG
 
 # Option 2: Direct Uvicorn (Simple, but less process management)
-poetry run newrelic-admin run-program uvicorn giraffe:app --host 0.0.0.0 --port 8080 --workers 4 --log-level debug
+uv run newrelic-admin run-program uvicorn giraffe:app --host 0.0.0.0 --port 8080 --workers 4 --log-level debug
 
 # Option 3: Hypercorn (For HTTP/3 support)
-# poetry run newrelic-admin run-program hypercorn giraffe:app --bind 0.0.0.0:8080 --workers 4 --log-level debug
+# uv run newrelic-admin run-program hypercorn giraffe:app --bind 0.0.0.0:8080 --workers 4 --log-level debug
 
 # Option 4: Granian (Maximum performance)
-# poetry run newrelic-admin run-program granian --interface asgi giraffe:app --host 0.0.0.0 --port 8080 --workers 4 
+# uv run newrelic-admin run-program granian --interface asgi giraffe:app --host 0.0.0.0 --port 8080 --workers 4