Merge master into remove-speakers branch and resolve conflicts

- Resolved modify/delete conflicts by keeping speakers app deletion
- Updated CLAUDE.md to remove references to speakers/sessions functionality
- Merged latest changes from master including CI/CD improvements

Author: matrixise

.github/workflows/test.yml

@@ -2,21 +2,58 @@ name: Test packages
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  build:
-    name: Execute tests
+  test:
+    name: Run code quality checks and tests
     runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:17
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test_db
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
     env:
       DJANGO_SETTINGS_MODULE: pythonie.settings.tests
+      DATABASE_URL: postgresql://postgres:postgres@localhost:5432/test_db
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up Python 3.12
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
-      - name: Install the dependencies
+          python-version: "3.13"
+          cache: 'pip'
+          cache-dependency-path: |
+            requirements/main.txt
+            requirements/dev.txt
+            requirements/production.txt
+
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools uv
-          python -m uv pip install -r requirements/main.txt -r requirements/dev.txt
-      - name: Run the tests
+          python -m uv pip install -r requirements/main.txt -r requirements/dev.txt -r requirements/production.txt
+
+      - name: Check code formatting with Ruff
+        run: |
+          python -m ruff format --check pythonie
+
+      - name: Lint code with Ruff
+        run: |
+          python -m ruff check pythonie
+
+      - name: Check for security vulnerabilities
+        run: |
+          python -m pip_audit
+
+      - name: Run Django tests
         run: |
           python pythonie/manage.py test pythonie --verbosity=2

.gitignore

@@ -64,3 +64,20 @@ project.db
 # Virtualenv folders
 *venv/
 
+# Environment files with sensitive credentials
+.envrc
+development.env
+production.env
+
+# Database dumps and local databases
+*.dump
+*.duckdb
+
+# Local settings
+pythonie/pythonie/settings/pgdev.py
+
+# MinIO data directory
+mc/
+
+# Personal notes
+TODO.md

.tool-versions

@@ -1,2 +1,2 @@
-python 3.13.9
+python 3.13.11
 task 3.37.2

CLAUDE.md

@@ -4,11 +4,11 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-This is the Python Ireland (python.ie / pycon.ie) website, built with Django 5.2 and Wagtail CMS 7.2. It manages content for the Python Ireland community including meetups, sponsors, speakers, and PyCon talks/sessions.
+This is the Python Ireland (python.ie / pycon.ie) website, built with Django 6.0 and Wagtail CMS 7.2. It manages content for the Python Ireland community including meetups and sponsors.
 
 ### Python Version
 
-This project requires **Python 3.13**. All code must be compatible with Python 3.13. When developing locally without Docker, ensure you are using Python 3.13.x.
+This project requires **Python 3.13.11** (or any Python 3.13.x). All code must be compatible with Python 3.13. When developing locally without Docker, ensure you are using Python 3.13.x.
 
 ## Architecture
 
@@ -19,7 +19,6 @@ The project follows a modular Django app structure within the `pythonie/` direct
 - **core**: Base Wagtail pages (HomePage, SimplePage) with StreamField content blocks. Implements PageSegment snippets and mixins (MeetupMixin, SponsorMixin) for common functionality.
 - **meetups**: Manages Meetup.com integration for Python Ireland meetups. Includes a management command `updatemeetups` to sync with Meetup API.
 - **sponsors**: Sponsor management with SponsorshipLevel relationships.
-- **speakers**: Speaker and Session (talk/workshop) management for conferences. Includes Sessionize integration via management commands (`import-sessionize`, `update-sessionize-json-stream`).
 
 ### Settings Configuration
 
@@ -42,8 +41,8 @@ Always specify settings module: `--settings=pythonie.settings.dev` (or `tests`,
 
 ### Key Dependencies
 
-- Django ~5.2.0
-- Wagtail ~7.2.0 (CMS framework)
+- Django 6.0
+- Wagtail 7.2.1 (CMS framework)
 - Redis (caching, configured via `REDISCLOUD_URL`)
 - WhiteNoise (static file serving)
 - boto3/django-storages (S3 integration)
@@ -208,26 +207,13 @@ task heroku:maintenance:on
 task heroku:maintenance:off
 ```
 
-### Conference Management
-
-```bash
-# Import speakers/sessions from Sessionize
-task pycon:import:sessionize
-# or: docker compose run web python pythonie/manage.py import-sessionize --file sessionize.xlsx
-
-# Update from Sessionize JSON stream
-task pycon:import:sessionize:json
-```
-
 ## Important Implementation Notes
 
 ### Wagtail Page Models
 
 All page types inherit from `wagtail.models.Page`. The page tree structure:
 - HomePage (root, can have child HomePage or SimplePage)
 - SimplePage
-- SpeakersPage → Speaker pages
-- TalksPage → Session pages
 
 Pages use StreamFields for flexible content blocks (heading, paragraph, video, image, slide, html).
 
@@ -260,7 +246,7 @@ Tests use `pythonie.settings.tests` which configures SQLite and mock Redis. Run
 
 ### Deployment
 
-The project is hosted on Heroku.
+The project is hosted on Heroku using the **heroku-24** stack with PostgreSQL 17.
 
 ### Upgrading Wagtail
 

CONTRIBUTING.md

@@ -158,7 +158,7 @@ refactor/simplify-sponsor-model
 
 ### Python
 
-- **Python version**: 3.13 (strict requirement)
+- **Python version**: 3.13.11 (or any Python 3.13.x - strict requirement)
 - **Formatter**: Ruff
 - **Line length**: 88 characters (Ruff default)
 - **Imports**: Sorted automatically by Ruff

DEVELOPMENT.md

@@ -22,16 +22,16 @@
 
 ### Tech Stack
 
-- **Framework**: Django 5.2.8
-- **CMS**: Wagtail 7.2
-- **Python**: 3.13 (required)
+- **Framework**: Django 6.0
+- **CMS**: Wagtail 7.2.1
+- **Python**: 3.13.11 (or any Python 3.13.x - required)
 - **Database**: PostgreSQL 17 (prod and dev via Docker)
 - **Cache**: Redis 6.2
 - **Storage**: AWS S3 (prod), Local (dev)
 - **Server**: Gunicorn (prod), Runserver (dev)
 - **Containerization**: Docker + docker-compose
 - **Automation**: Task (Taskfile.yaml)
-- **Deployment**: Heroku
+- **Deployment**: Heroku (heroku-24 stack)
 
 ### Project Statistics
 
@@ -105,7 +105,7 @@ pythonie/
 
 ### Prerequisites
 
-- Python 3.13 (required)
+- Python 3.13.11 (or any Python 3.13.x - required)
 - Docker + docker-compose
 - Task (or Make)
 - Git
@@ -1441,6 +1441,7 @@ pythonie/pythonie/wsgi.py     # WSGI application
 ---
 
 **Last updated**: 2025
-**Django Version**: 5.2.8
-**Wagtail Version**: 7.2
-**Python Version**: 3.13
+**Django Version**: 6.0
+**Wagtail Version**: 7.2.1
+**Python Version**: 3.13.11
+**Heroku Stack**: heroku-24

README.md

@@ -1,13 +1,14 @@
 # Python Ireland Website
 
-Website for Python Ireland (python.ie / pycon.ie) community, built with Django 5.2 and Wagtail CMS 7.2. Manages meetups, sponsors, speakers, and conference sessions.
+Website for Python Ireland (python.ie / pycon.ie) community, built with Django 6.0 and Wagtail CMS 7.2. Manages meetups, sponsors, speakers, and conference sessions.
 
 ## Prerequisites
 
 - Python 3.13 (see `.tool-versions`)
 - Docker & Docker Compose (for containerized development - recommended)
 - [Task](https://taskfile.dev/) (optional but recommended)
 - Redis (only for local non-Docker development)
+- Environment variables file as per [the instructions here](#environment-variables)
 
 ## Quick Start (Docker - Recommended)
 
@@ -27,19 +28,24 @@ Website for Python Ireland (python.ie / pycon.ie) community, built with Django 5
    task django:migrate
    ```
 
-4. Create a superuser:
+4. Generate sample data (creates pages, navigation, meetups):
+   ```bash
+   docker compose run --rm web python pythonie/manage.py generate_sample_data --settings=pythonie.settings.dev
+   ```
+
+5. Create a superuser:
    ```bash
    docker compose run --rm web python pythonie/manage.py createsuperuser --settings=pythonie.settings.dev
    ```
 
-5. Start the development server:
+6. Start the development server:
    ```bash
    task run
    # or: docker compose run --rm --service-ports web python pythonie/manage.py runserver 0.0.0.0:8000
    ```
 
-6. Visit http://127.0.0.1:8000/ in your browser
-7. Access Wagtail admin at http://127.0.0.1:8000/admin/
+7. Visit http://127.0.0.1:8000/ to see the site with sample content
+8. Access Wagtail admin at http://127.0.0.1:8000/admin/
 
 ## Local Setup (Without Docker)
 
@@ -52,11 +58,13 @@ If you prefer to develop without Docker:
 5. Activate the virtualenv: `source pythonie-venv/bin/activate`
 6. Install dependencies: `pip install -r requirements.txt` (or `uv pip install -r requirements.txt`)
 7. Set up the database: `python pythonie/manage.py migrate --settings=pythonie.settings.dev`
-8. Create a superuser: `python pythonie/manage.py createsuperuser --settings=pythonie.settings.dev`
-9. Install and run Redis server locally: `redis-server`
-10. Set Redis environment variable: `export REDISCLOUD_URL=127.0.0.1:6379`
-11. Run the server: `python pythonie/manage.py runserver --settings=pythonie.settings.dev`
-12. Visit http://127.0.0.1:8000/admin/ to log in
+8. Generate sample data: `python pythonie/manage.py generate_sample_data --settings=pythonie.settings.dev`
+9. Create a superuser: `python pythonie/manage.py createsuperuser --settings=pythonie.settings.dev`
+10. Install and run Redis server locally: `redis-server`
+11. Set Redis environment variable: `export REDISCLOUD_URL=127.0.0.1:6379`
+12. Run the server: `python pythonie/manage.py runserver --settings=pythonie.settings.dev`
+13. Visit http://127.0.0.1:8000/ to see the site with sample content
+14. Visit http://127.0.0.1:8000/admin/ to log in to Wagtail admin
 
 ## Project Structure
 
@@ -87,6 +95,9 @@ task django:migrate           # Run migrations
 task django:make-migrations   # Create new migrations
 task django:collect-static    # Collect static files
 
+# Sample Data (for development)
+python pythonie/manage.py generate_sample_data --settings=pythonie.settings.dev
+
 # Testing
 task tests                    # Run test suite
 make docker-tests             # Alternative test command
@@ -202,7 +213,7 @@ export MEETUP_KEY=your_meetup_api_key  # Get from https://secure.meetup.com/meet
 
 ## Deployment
 
-The project is deployed on Heroku. Use Task commands for database operations:
+The project is deployed on Heroku using the **heroku-24** stack with PostgreSQL 17. Use Task commands for database operations:
 
 ```bash
 # View backups

pythonie/core/factories.py

@@ -0,0 +1,51 @@
+import factory
+from django.utils import timezone
+from factory.django import DjangoModelFactory
+from meetups.models import Meetup
+from sponsors.models import SponsorshipLevel
+
+from core.models import HomePage, SimplePage
+
+
+class SponsorshipLevelFactory(DjangoModelFactory):
+    class Meta:
+        model = SponsorshipLevel
+        django_get_or_create = ("name",)
+
+    level = 100
+    name = "Bronze"
+
+
+class MeetupFactory(DjangoModelFactory):
+    class Meta:
+        model = Meetup
+        django_get_or_create = ("id",)
+
+    id = factory.Sequence(lambda n: f"meetup-{n}")
+    name = "Python Ireland Meetup"
+    description = "Monthly Python meetup in Dublin"
+    event_url = "https://meetup.com/pythonireland/"
+    time = factory.LazyFunction(lambda: timezone.now() + timezone.timedelta(days=30))
+    created = factory.LazyFunction(timezone.now)
+    rsvps = 50
+    status = "upcoming"
+    visibility = "public"
+
+
+class HomePageFactory(DjangoModelFactory):
+    class Meta:
+        model = HomePage
+
+    title = "Python Ireland"
+    slug = "home"
+    show_meetups = True
+    body = []
+
+
+class SimplePageFactory(DjangoModelFactory):
+    class Meta:
+        model = SimplePage
+
+    title = "Sample Page"
+    slug = "sample-page"
+    body = []