Merge branch 'enext' into send-email-tz-fix

Author: mariobehling

.github/workflows/deploy-docs.yml

@@ -0,0 +1,103 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - enext
+      - main
+    paths:
+      - 'doc/**'
+      - '.github/workflows/deploy-docs.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            enchant-2 \
+            libffi-dev \
+            libssl-dev \
+            libxml2-dev \
+            libxslt1-dev \
+            gettext \
+            libfreetype-dev \
+            libjpeg-dev \
+            libpq-dev \
+            build-essential
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          cd doc
+          # Install all dependencies (Sphinx, Django, and all packages)
+          bash install-all-deps.sh
+
+      - name: Build unified documentation
+        run: |
+          cd doc
+          # Set environment variables (conf.py handles Django setup automatically)
+          export DJANGO_SETTINGS_MODULE=eventyay.config.settings
+          export EVENTYAY_CONFIG_FILE=$(pwd)/eventyay-docs.cfg
+          export DATABASE_URL="sqlite:///:memory:"
+          export REDIS_URL="redis://localhost:6379/0"
+          export MPLCONFIGDIR=/tmp/matplotlib
+          mkdir -p $MPLCONFIGDIR
+          # Build documentation
+          make html
+
+      - name: Prepare deployment
+        run: |
+          mkdir -p _site
+          # Copy unified documentation (includes all components: tickets, talk, video)
+          echo "Copying unified documentation..."
+          cp -r doc/_build/html/* _site/
+          # Copy CNAME for custom domain (docs.eventyay.com)
+          cp doc/CNAME _site/
+          # Create .nojekyll to prevent GitHub Pages from ignoring files starting with _
+          touch _site/.nojekyll
+          # List contents for verification
+          echo "Documentation site structure:"
+          ls -la _site/
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: '_site'
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+

.github/workflows/gh-pages-deploy.yml

@@ -19,6 +19,10 @@ __pycache__/
 .mypy_cache/
 .ipython/
 _static/
+# Exception: Track documentation static files
+!doc/_static/
+!doc/talk/_static/
+!doc/video/_static/
 .idea
 .secret
 atlassian-ide-plugin.xml

.gitignore

@@ -59,6 +59,7 @@ Getting Started
 4. **Install Python packages**
 
 Use ``uv`` to create virtual environment and install Python packages at the same time.
+**Make sure you are in app directory**
 
   .. code-block:: sh
 
@@ -88,10 +89,9 @@ From now on, you can do everything with the database without specifying password
 
 .. code-block:: sh
 
-   dropdb eventyay-db
    psql eventyay-db
 
-In case you cannot take adavantage of PostgreSQL *peer* mode, you need to create a *.env* file with these values:
+In case you cannot take advantage of PostgreSQL *peer* mode, you need to create a *.env* file with these values:
 
 .. code-block:: sh
 
@@ -102,9 +102,7 @@ In case you cannot take adavantage of PostgreSQL *peer* mode, you need to create
 
 6. **Activate virtual environment**
 
-After running ``uv sync```, ``uv`` will activate the virtual environment. But if you are back
-to work on the project another, we don't run ``uv``, then we activate the virtual environment by:
-
+After running ``uv sync```, activate a virtual environment
 
   .. code-block:: sh
 
@@ -117,11 +115,23 @@ to work on the project another, we don't run ``uv``, then we activate the virtua
 
       python manage.py migrate
 
-8. **Create a superuser account** (for accessing the admin panel):
+   If you see any Redis issues, Install Redis and start it:
+
+   **Update configuration**
+
+
+   Edit ``app/eventyay.cfg`` and change Redis URLs from
+   ``redis://eventyay-next-redis`` **to**
+   ``redis://localhost:6379/``
+
+
+   Do **not** edit the database numbers (0, 1, etc.).
+
+8. **Create a admin user account** (for accessing the admin panel):
 
    .. code-block:: bash
 
-      python manage.py createsuperuser
+      python manage.py create_admin_user
 
 9. **Run the development server**:
 
@@ -166,7 +176,7 @@ We assume your current working directory is the checkout of this repo.
 
 5. **Create a superuser account** (for accessing the admin panel):
 
-   This should be necessary only once, since the database is persisted 
+   This should be necessary only once, since the database is persisted
    as docker volume. If you see strange behaviour, see the point 3.
    on how to reset.
 

README.rst

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.9 on 2025-09-10 12:36
+# Generated by Django 5.2.5 on 2025-10-30 17:53
 
 import oauth2_provider.generators
 import oauth2_provider.models
@@ -8,20 +8,19 @@
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
-    dependencies = []
+    dependencies = [
+    ]
 
     operations = [
         migrations.CreateModel(
             name='OAuthAccessToken',
             fields=[
                 ('id', models.BigAutoField(primary_key=True, serialize=False)),
                 ('token', models.TextField()),
-                (
-                    'token_checksum',
-                    oauth2_provider.models.TokenChecksumField(db_index=True, max_length=64, unique=True),
-                ),
+                ('token_checksum', oauth2_provider.models.TokenChecksumField(db_index=True, max_length=64, unique=True)),
                 ('expires', models.DateTimeField()),
                 ('scope', models.TextField(blank=True)),
                 ('created', models.DateTimeField(auto_now_add=True)),
@@ -35,83 +34,19 @@ class Migration(migrations.Migration):
             name='OAuthApplication',
             fields=[
                 ('id', models.BigAutoField(primary_key=True, serialize=False)),
-                (
-                    'client_type',
-                    models.CharField(choices=[('confidential', 'Confidential'), ('public', 'Public')], max_length=32),
-                ),
-                (
-                    'authorization_grant_type',
-                    models.CharField(
-                        choices=[
-                            ('authorization-code', 'Authorization code'),
-                            ('implicit', 'Implicit'),
-                            ('password', 'Resource owner password-based'),
-                            ('client-credentials', 'Client credentials'),
-                            ('openid-hybrid', 'OpenID connect hybrid'),
-                        ],
-                        max_length=32,
-                    ),
-                ),
+                ('client_type', models.CharField(choices=[('confidential', 'Confidential'), ('public', 'Public')], max_length=32)),
+                ('authorization_grant_type', models.CharField(choices=[('authorization-code', 'Authorization code'), ('implicit', 'Implicit'), ('password', 'Resource owner password-based'), ('client-credentials', 'Client credentials'), ('openid-hybrid', 'OpenID connect hybrid')], max_length=32)),
                 ('hash_client_secret', models.BooleanField(default=True)),
                 ('skip_authorization', models.BooleanField(default=False)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True)),
-                (
-                    'algorithm',
-                    models.CharField(
-                        blank=True,
-                        choices=[
-                            ('', 'No OIDC support'),
-                            ('RS256', 'RSA with SHA-2 256'),
-                            ('HS256', 'HMAC with SHA-2 256'),
-                        ],
-                        default='',
-                        max_length=5,
-                    ),
-                ),
-                (
-                    'allowed_origins',
-                    models.TextField(
-                        blank=True, default='', help_text='Allowed origins list to enable CORS, space separated'
-                    ),
-                ),
+                ('algorithm', models.CharField(blank=True, choices=[('', 'No OIDC support'), ('RS256', 'RSA with SHA-2 256'), ('HS256', 'HMAC with SHA-2 256')], default='', max_length=5)),
+                ('allowed_origins', models.TextField(blank=True, default='', help_text='Allowed origins list to enable CORS, space separated')),
                 ('name', models.CharField(max_length=255, verbose_name='Application name')),
-                (
-                    'redirect_uris',
-                    models.TextField(
-                        help_text='Allowed URIs list, space separated',
-                        validators=[oauth2_provider.validators.URIValidator],
-                        verbose_name='Redirection URIs',
-                    ),
-                ),
-                (
-                    'post_logout_redirect_uris',
-                    models.TextField(
-                        blank=True,
-                        default='',
-                        help_text='Allowed list with space separated',
-                        validators=[oauth2_provider.validators.URIValidator],
-                    ),
-                ),
-                (
-                    'client_id',
-                    models.CharField(
-                        db_index=True,
-                        default=oauth2_provider.generators.generate_client_id,
-                        max_length=100,
-                        unique=True,
-                        verbose_name='Client ID',
-                    ),
-                ),
-                (
-                    'client_secret',
-                    oauth2_provider.models.ClientSecretField(
-                        db_index=True,
-                        default=oauth2_provider.generators.generate_client_secret,
-                        max_length=255,
-                        verbose_name='Client secret',
-                    ),
-                ),
+                ('redirect_uris', models.TextField(help_text='Allowed URIs list, space separated', validators=[oauth2_provider.validators.URIValidator], verbose_name='Redirection URIs')),
+                ('post_logout_redirect_uris', models.TextField(blank=True, default='', help_text='Allowed list with space separated', validators=[oauth2_provider.validators.URIValidator])),
+                ('client_id', models.CharField(db_index=True, default=oauth2_provider.generators.generate_client_id, max_length=100, unique=True, verbose_name='Client ID')),
+                ('client_secret', oauth2_provider.models.ClientSecretField(db_index=True, default=oauth2_provider.generators.generate_client_secret, max_length=255, verbose_name='Client secret')),
                 ('active', models.BooleanField(default=True)),
             ],
             options={
@@ -128,12 +63,7 @@ class Migration(migrations.Migration):
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('code_challenge', models.CharField(blank=True, default='', max_length=128)),
-                (
-                    'code_challenge_method',
-                    models.CharField(
-                        blank=True, choices=[('plain', 'plain'), ('S256', 'S256')], default='', max_length=10
-                    ),
-                ),
+                ('code_challenge_method', models.CharField(blank=True, choices=[('plain', 'plain'), ('S256', 'S256')], default='', max_length=10)),
                 ('nonce', models.CharField(blank=True, default='', max_length=255)),
                 ('claims', models.TextField(blank=True)),
                 ('redirect_uri', models.CharField(max_length=2500)),
@@ -176,10 +106,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('enabled', models.BooleanField(default=True, verbose_name='Enable webhook')),
                 ('target_url', models.URLField(verbose_name='Target URL')),
-                (
-                    'all_events',
-                    models.BooleanField(default=True, verbose_name='All events (including newly created ones)'),
-                ),
+                ('all_events', models.BooleanField(default=True, verbose_name='All events (including newly created ones)')),
             ],
             options={
                 'ordering': ('id',),