diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 434e57afe..e786db5bc 100644 --- a/.github/workflows/e2e.yml +++ b/.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 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a8540e91e..e6f747610 100644 --- a/.github/workflows/linting.yml +++ b/.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 diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index 11d5ac676..9413736a6 100644 --- a/.github/workflows/mobile.yml +++ b/.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" \ No newline at end of file + EXPO_PUBLIC_ROLLBAR_ACCESS_TOKEN: "1a19e5da05b2435b802d5a81aba2bbd7" diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 05277c856..1e4e3ebeb 100644 --- a/.github/workflows/pytest.yml +++ b/.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: | diff --git a/Pipfile b/Pipfile index 5c72b7f9b..f9cd8376e 100644 --- a/Pipfile +++ b/Pipfile @@ -22,4 +22,4 @@ Jinja2 = "==3.0.1" [dev-packages] [requires] -python_version = "3.10" +python_version = "3.12" diff --git a/README.md b/README.md index a7da5a6b5..13a8a3985 100644 --- a/README.md +++ b/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 diff --git a/setup.py b/setup.py index b154405bd..d05004c01 100644 --- a/setup.py +++ b/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", ], diff --git a/{{cookiecutter.project_slug}}/.github/workflows/linting.yml b/{{cookiecutter.project_slug}}/.github/workflows/linting.yml index d6d8b88cd..63cd16b2e 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/linting.yml +++ b/{{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 diff --git a/{{cookiecutter.project_slug}}/Pipfile b/{{cookiecutter.project_slug}}/Pipfile index 70d603f20..3f9c53abc 100644 --- a/{{cookiecutter.project_slug}}/Pipfile +++ b/{{cookiecutter.project_slug}}/Pipfile @@ -33,7 +33,7 @@ premailer = "*" drf-spectacular = "*" [requires] -python_version = "3.10" +python_version = "3.12" [dev-packages] # Code quality diff --git a/{{cookiecutter.project_slug}}/compose/server/Dockerfile b/{{cookiecutter.project_slug}}/compose/server/Dockerfile index 0d7ed6c16..1bb2b7b69 100644 --- a/{{cookiecutter.project_slug}}/compose/server/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/server/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-buster +FROM python:3.12-slim-bullseye # These environment values help with watching for file changes ENV PYTHONUNBUFFERED 1 diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 119ff1023..32905d6e0 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.10.7 +python-3.12.7