Merge branch 'dev' into fix/payment-duplicate-confirmation

Author: ArnavBallinCode

.dockerignore

@@ -10,3 +10,7 @@ src/dist/
 .venv
 app/.venv
 app/eventyay/static/CACHE
+app/eventyay/static.dist
+*.egg-info
+**/__pycache__
+**/node_modules

.github/workflows/deploy-docs.yml

@@ -3,7 +3,7 @@ name: Deploy Documentation
 on:
   push:
     branches:
-      - enext
+      - dev
       - main
     paths:
       - 'doc/**'

.github/workflows/enext-docker-pr.yml

@@ -1,12 +1,12 @@
-name: Docker PR Build (enext)
+name: Docker PR Build (dev/main)
 
 on:
   pull_request:
-    branches: [enext]
+    branches: [ dev, main ]
 
 jobs:
   build_docker_image:
-    name: Build Docker image for enext PR
+    name: Build Docker image for dev PR
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/enext-docker.yml

@@ -2,7 +2,7 @@ name: Docker
 on:
   workflow_dispatch:
   push:
-    branches: [ enext ]
+    branches: [ dev, main ]
 
 jobs:
   push_to_registry:
@@ -11,19 +11,19 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
           images: eventyay/eventyay-next
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:

.github/workflows/tests.yml

@@ -14,41 +14,34 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Tests
     strategy:
       matrix:
-        python-version: [3.11]
-        database: [sqlite, postgres]
-        exclude:
-          - database: sqlite
-            python-version: 3.11
+        python-version: [3.12]
+        database: [postgres]
     steps:
       - uses: actions/checkout@v4
       - uses: harmon758/postgresql-action@v1
         with:
-          postgresql version: '15'
+          postgresql version: '16'
           postgresql db: 'pretix'
           postgresql user: 'postgres'
           postgresql password: 'postgres'
         if: matrix.database == 'postgres'
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: latest
+          enable-cache: true
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
       - name: Install system dependencies
         run: sudo apt update && sudo apt install gettext
       - name: Install Python dependencies
-        run: |
-          sed -i '/eventyay-stripe/d' pyproject.toml
-          sed -i '/eventyay-paypal/d' pyproject.toml
-          pip3 install --ignore-requires-python -e ".[dev]" psycopg2-binary
+        run: uv sync --all-extras --group test --no-editable
       - name: Run checks
         run: python manage.py check
         working-directory: ./src
@@ -60,10 +53,15 @@ jobs:
         run: make all compress
       - name: Run tests
         working-directory: ./src
-        run: PRETIX_CONFIG_FILE=tests/travis_${{ matrix.database }}.cfg py.test -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
+        run: pytest -n 3 -p no:sugar --cov=./ --cov-report=xml --reruns 3 tests --maxfail=100
       - name: Upload coverage
         uses: codecov/codecov-action@v1
         with:
           file: src/coverage.xml
           fail_ci_if_error: true
-        if: matrix.database == 'postgres' && matrix.python-version == '3.11' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master')
+        if: matrix.database == 'postgres' && matrix.python-version == '3.12' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master')
+    env:
+      EVY_POSTGRES_HOST: localhost
+      EVY_POSTGRES_PORT: 5432
+      EVY_POSTGRES_USER: postgres
+      EVY_POSTGRES_DB: pretix

.gitignore

@@ -60,6 +60,10 @@ deployment/.env.dev
 deployment/.env.prod
 deployment/.env
 deployment/data
+*.local.cfg
+*.local.toml
+.secrets
+app/.env
 
 # Emails which are not sent out to Internet are saved here.
 dev-sent-emails