Merge branch 'main' into feature/issue-2645

Author: iampujan

.github/dependabot.yml

@@ -3,31 +3,23 @@ updates:
 - package-ecosystem: pip
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
+  cooldown:
+    default-days: 7
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: docutils
-    versions:
-    - "0.16"
-    - "0.17"
-  - dependency-name: responses
-    versions:
-    - 0.12.1
-    - 0.13.0
-    - 0.13.1
-    - 0.13.2
-  - dependency-name: "boto3"
-  - dependency-name: "boto3-stubs"
-  - dependency-name: "botocore"
-  - dependency-name: "botocore-stubs"
-  - dependency-name: lxml
-    versions:
-    - 4.6.2
 - package-ecosystem: github-actions
   directory: "/"
   groups:
     github-actions:
       patterns:
         - "*"  # Group all Actions updates into a single larger pull request
   schedule:
-    interval: daily
+    interval: weekly
+  cooldown:
+    default-days: 7
+- package-ecosystem: docker
+  directory: "/"
+  schedule:
+    interval: weekly
+  cooldown:
+    default-days: 7

Dockerfile

@@ -1,3 +1,5 @@
+FROM ghcr.io/astral-sh/uv:0.11.8@sha256:3b7b60a81d3c57ef471703e5c83fd4aaa33abcd403596fb22ab07db85ae91347 AS uv
+
 FROM python:3.12.6-bookworm
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -32,16 +34,19 @@ RUN case $(uname -m) in \
 RUN mkdir /code
 WORKDIR /code
 
-RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel
+COPY --from=uv /uv /uvx /usr/local/bin/
 
-COPY pyproject.toml /code/
+COPY pyproject.toml uv.lock /code/
 
-RUN --mount=type=cache,target=/root/.cache/pip \
+RUN --mount=type=cache,target=/root/.cache \
     set -x \
-    && pip --disable-pip-version-check \
-        install --group dev \
-        .
+    && uv sync \
+         --frozen \
+         --no-editable \
+         --no-install-project
 
 COPY . /code/
 
-RUN pip --disable-pip-version-check install --no-deps -e '.'
+RUN uv sync \
+      --frozen \
+      --no-editable

Dockerfile.cabotage

@@ -1,3 +1,5 @@
+FROM ghcr.io/astral-sh/uv:0.11.8@sha256:3b7b60a81d3c57ef471703e5c83fd4aaa33abcd403596fb22ab07db85ae91347 AS uv
+
 FROM python:3.12.6-bookworm
 COPY --from=ewdurbin/nginx-static:1.25.x /usr/bin/nginx /usr/bin/nginx
 ENV PYTHONUNBUFFERED=1
@@ -33,17 +35,28 @@ RUN case $(uname -m) in \
 RUN mkdir /code
 WORKDIR /code
 
-RUN pip --no-cache-dir --disable-pip-version-check install --upgrade pip setuptools wheel
+ENV VIRTUAL_ENV=/code/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+COPY --from=uv /uv /uvx /usr/local/bin/
 
-COPY pyproject.toml /code/
+COPY pyproject.toml uv.lock /code/
 
-RUN --mount=type=cache,target=/root/.cache/pip \
+RUN --mount=type=cache,target=/root/.cache \
     set -x \
-    && pip --disable-pip-version-check \
-        install \
-        '.[prod]'
+    && uv sync \
+         --frozen \
+         --no-editable \
+         --no-dev \
+         --extra prod \
+         --no-install-project
 
 COPY . /code/
 
-RUN pip --disable-pip-version-check install --no-deps '.'
-RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static python manage.py collectstatic --noinput
+RUN uv sync \
+      --frozen \
+      --no-editable \
+      --no-dev \
+      --extra prod
+
+RUN DJANGO_SETTINGS_MODULE=pydotorg.settings.static uv run python manage.py collectstatic --noinput

Makefile

@@ -16,8 +16,8 @@ help: ## Display this help text
 	mkdir -p .state && touch .state/db-migrated
 
 .state/db-initialized: .state/docker-build-web .state/db-migrated
-	docker compose run --rm web ./manage.py createcachetable
-	docker compose run --rm web ./manage.py loaddata fixtures/*.json
+	docker compose run --rm web uv run ./manage.py createcachetable
+	docker compose run --rm web uv run ./manage.py loaddata fixtures/*.json
 	mkdir -p .state && touch .state/db-initialized
 
 # =============================================================================
@@ -30,16 +30,16 @@ serve: .state/db-initialized ## Start the application
 	docker compose up --remove-orphans
 
 migrations: .state/db-initialized ## Generate migrations from models
-	docker compose run --rm web ./manage.py makemigrations
+	docker compose run --rm web uv run ./manage.py makemigrations
 
 migrate: .state/docker-build-web ## Run Django migrate
-	docker compose run --rm web ./manage.py migrate
+	docker compose run --rm web uv run ./manage.py migrate
 
 manage: .state/db-initialized ## Run arbitrary manage.py commands
-	docker compose run --rm web ./manage.py $(filter-out $@,$(MAKECMDGOALS))
+	docker compose run --rm web uv run ./manage.py $(filter-out $@,$(MAKECMDGOALS))
 
 shell: .state/db-initialized ## Open Django interactive shell
-	docker compose run --rm web ./manage.py shell
+	docker compose run --rm web uv run ./manage.py shell
 
 docker_shell: .state/db-initialized ## Open bash in web container
 	docker compose run --rm web /bin/bash
@@ -61,7 +61,7 @@ fmt: ## Run ruff formatter
 	@if command -v ruff >/dev/null 2>&1; then ruff format .; else docker compose run --rm web ruff format .; fi
 
 test: .state/db-initialized ## Run test suite
-	docker compose run --rm web ./manage.py test
+	docker compose run --rm web uv run python ./manage.py test
 
 ci: lint fmt test ## Run lint, fmt, then tests
 

apps/sponsors/api.py

@@ -45,6 +45,17 @@ def get(self, request, *args, **kwargs):
             sponsorships = sponsorships.filter(year=logo_filters.by_year)
         for sponsorship in sponsorships.select_related("sponsor").iterator():
             sponsor = sponsorship.sponsor
+            contacts = [
+                {
+                    "name": c.name,
+                    "email": c.email,
+                    "primary": c.primary,
+                    "administrative": c.administrative,
+                    "accounting": c.accounting,
+                    "manager": c.manager,
+                }
+                for c in sponsor.contacts.all()
+            ]
             base_data = {
                 "sponsor_id": sponsor.id,
                 "sponsor": sponsor.name,
@@ -55,6 +66,7 @@ def get(self, request, *args, **kwargs):
                 "logo": sponsor.web_logo.url,
                 "white_logo": sponsor.white_logo.url if sponsor.white_logo else None,
                 "sponsor_url": sponsor.landing_page_url,
+                "contacts": contacts,
                 "start_date": sponsorship.start_date,
                 "end_date": sponsorship.end_date,
             }

apps/sponsors/serializers.py

@@ -6,6 +6,17 @@
 from apps.sponsors.models.enums import LogoPlacementChoices, PublisherChoices
 
 
+class SponsorContactSerializer(serializers.Serializer):
+    """Serializer for sponsor contact information."""
+
+    name = serializers.CharField()
+    email = serializers.EmailField()
+    primary = serializers.BooleanField()
+    administrative = serializers.BooleanField()
+    accounting = serializers.BooleanField()
+    manager = serializers.BooleanField()
+
+
 class LogoPlacementSerializer(serializers.Serializer):
     """Serializer for sponsor logo placement data."""
 
@@ -22,6 +33,7 @@ class LogoPlacementSerializer(serializers.Serializer):
     sponsor_url = serializers.URLField()
     level_name = serializers.CharField()
     level_order = serializers.IntegerField()
+    contacts = SponsorContactSerializer(many=True, required=False)
 
 
 class AssetSerializer(serializers.ModelSerializer):

docker-compose.yml

@@ -23,7 +23,7 @@ services:
   web:
     build: .
     image: pythondotorg:docker-compose
-    command: python manage.py runserver 0.0.0.0:8000
+    command: uv run python manage.py runserver 0.0.0.0:8000
     volumes:
       - .:/code
     ports:
@@ -39,7 +39,7 @@ services:
 
   worker:
     image: pythondotorg:docker-compose
-    command: celery -A pydotorg worker -B -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
+    command: uv run celery -A pydotorg worker -B -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
     volumes:
       - .:/code
     environment:

pyproject.toml

@@ -16,16 +16,16 @@ dependencies = [
     "django-apptemplates==1.5",
     "django-admin-interface==0.28.9",
     "django-translation-aliases==0.1.0",
-    "Django==5.2.11",
+    "Django==5.2.13",
     "docutils==0.21.2",
     "Markdown==3.10.2",
     "cmarkgfm==2024.11.20",
     "Pygments>=2.17,<3",
-    "Pillow==10.4.0",
+    "Pillow==12.2.0",
     "psycopg2-binary==2.9.11",
     "python3-openid==3.2.0",
     "python-decouple==3.8",
-    "lxml==5.2.2",
+    "lxml==6.1.0",
     "cssselect==1.2.0",
     "feedparser==6.0.11",
     "beautifulsoup4==4.12.3",
@@ -64,7 +64,7 @@ prod = [
     "sentry-sdk[django]==2.53.0",
     "Whitenoise==6.11.0",
     "django-storages==1.14.6",
-    "boto3==1.26.165",
+    "boto3==1.43.4",
 ]
 
 [dependency-groups]