Merge branch 'main' into feature/add-expo-build-workflow

.github/workflows/e2e.yml

@@ -10,7 +10,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           # Can't use cache because of https://github.com/actions/cache/issues/319
           # cache: 'pipenv'
       - name: Install bootstrapper dependencies

.github/workflows/linting.yml

@@ -9,7 +9,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - run: pipenv install --dev --deploy
       - name: Run Black
@@ -21,7 +21,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - run: pipenv install --dev --deploy
       - name: Run flake8
@@ -36,7 +36,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - name: 🐍 Install python dependencies
         run: pipenv install --dev --deploy
@@ -58,7 +58,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - name: 🐍 Install python dependencies
         run: pipenv install --dev --deploy
@@ -80,7 +80,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - name: 🐍 Install python dependencies
         run: pipenv install --dev --deploy
@@ -110,7 +110,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
           cache: "pipenv"
       - name: 🐍 Install python dependencies
         run: pipenv install --dev --deploy

.github/workflows/mobile.yml

@@ -1,5 +1,5 @@
 name: Mobile Deployment
-on: [deployment_status,   workflow_dispatch]
+on: [deployment_status, workflow_dispatch]
 
 jobs:
   Setup:
@@ -10,7 +10,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.12"
           # Can't use cache because of https://github.com/actions/cache/issues/319
           # cache: 'pipenv'
       - name: Install bootstrapper dependencies
@@ -44,7 +44,6 @@ jobs:
             echo $(git diff --name-only origin/main -- | grep "/clients/mobile/react-native/" | wc -l)
             echo "BUILD_MOBILE_APP=$(git diff --name-only origin/main -- | grep "/clients/mobile/react-native/" | wc -l)" >> $GITHUB_OUTPUT
           fi
-          
 
   publish:
     if: needs.configuremobile.outputs.BUILD_MOBILE_APP != 0
@@ -94,4 +93,4 @@ jobs:
           echo "${{ env.BACKEND_SERVER_URL }} and ${{ github.event.deployment_status.environment_url }}"
         env:
           EXPO_PUBLIC_BACKEND_SERVER_URL: "${{ github.event.deployment_status.environment_url }}"
-          EXPO_PUBLIC_ROLLBAR_ACCESS_TOKEN: "1a19e5da05b2435b802d5a81aba2bbd7"
+          EXPO_PUBLIC_ROLLBAR_ACCESS_TOKEN: "1a19e5da05b2435b802d5a81aba2bbd7"

.github/workflows/pytest.yml

@@ -9,8 +9,8 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-          cache: 'pipenv'
+          python-version: "3.12"
+          cache: "pipenv"
       - run: pipenv install --dev --deploy
       - name: Test with pytest
         run: pipenv run pytest
@@ -35,8 +35,8 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-          cache: 'pipenv'
+          python-version: "3.12"
+          cache: "pipenv"
       - name: Install bootstrapper dependencies
         run: pipenv install --dev --deploy
       - run: |

Pipfile

@@ -8,8 +8,8 @@ cookiecutter = "==2.1.1"
 binaryornot = "==0.4.4"
 black = "==22.3.0"
 isort = "==5.9.3"
-flake8 = "==3.9.2"
-flake8-isort = "==4.0.0"
+flake8 = "==7.1.1"
+flake8-isort = "==6.1.1"
 pre-commit = "==2.13.0"
 tox = "==3.24.0"
 pytest = "==6.2.4"
@@ -22,4 +22,4 @@ Jinja2 = "==3.0.1"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"

README.md

@@ -19,8 +19,8 @@ pipx run cookiecutter gh:thinknimble/tn-spa-bootstrapper
 
 See: [Maintained Foundation fork]
 
-- For Django 3.1
-- Uses Python 3.10 by default
+- For Django 4.2.\*
+- Uses Python 3.12 by default
 - Renders Django projects with 100% starting test coverage
 - Secure by default. We believe in SSL.
 - Optimized development and production settings

setup.py

@@ -34,14 +34,14 @@
     classifiers=[
         "Development Status :: 1 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 4.2",
         "Client Framework :: Vue",
         "Intended Audience :: Thinknimble Developers",
         "Natural Language :: English",
         "License :: Proprietary License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],

{{cookiecutter.project_slug}}/.github/workflows/linting.yml

@@ -8,7 +8,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pipenv'
       - run: pipenv install --dev --deploy
       - run: pipenv run black --check server
@@ -19,7 +19,7 @@ jobs:
       - run: pipx install pipenv
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pipenv'
       - run: pipenv install --dev --deploy
       - run: pipenv run flake8 server

{{cookiecutter.project_slug}}/.github/workflows/playwright.yml

@@ -7,18 +7,25 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.deployment_status.state == 'success'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install dependencies
-        run: npm --prefix ./client i
+        working-directory: ./client
+        run: npm install
       - name: Install Playwright
-        run: npx --prefix ./client playwright install --with-deps
+        working-directory: ./client
+        run: npx playwright install --with-deps
       - name: Run Playwright tests
-        run: npx --prefix ./client playwright test --reporter=html
+        working-directory: ./client
+        run: npx playwright test --reporter=html
         env:
-          PLAYWRIGHT_TEST_BASE_URL:
-            {{ "${{ github.event.deployment_status.environment_url }}" }}
-          PLAYWRIGHT_TEST_USER_PASS:
-            {{ "${{ secrets.PLAYWRIGHT_TEST_USER_PASS }}" }}
+          PLAYWRIGHT_TEST_BASE_URL: {{ "${{ github.event.deployment_status.environment_url }}" }}
+          PLAYWRIGHT_TEST_USER_PASS: {{ "${{ secrets.PLAYWRIGHT_TEST_USER_PASS }}" }}
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: playwright-report
+          path: ./client/playwright-report/
+          retention-days: 30

{{cookiecutter.project_slug}}/.gitignore

@@ -72,6 +72,7 @@ celerybeat-schedule
 # Environments
 .env*
 !.env.local.example
+!.env.example
 .venv
 env/
 venv/

{{cookiecutter.project_slug}}/Pipfile

@@ -7,7 +7,6 @@ name = "pypi"
 Django = "==4.2.*"
 django-extensions = "==3.2.3"
 django-filter = "==2.4.0"
-django-nose = "==1.4.7"
 dj-rest-auth = "*"
 dj-database-url = "==0.5.0"
 django-storages = "==1.11.1"  # https://github.com/jschneier/django-storages
@@ -33,7 +32,7 @@ premailer = "*"
 drf-spectacular = "*"
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"
 
 [dev-packages]
 # Code quality