Skip to content

Commit

Permalink
Begin changeover to Python 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
whusterj committed Nov 9, 2024
1 parent a16b513 commit cbc353c
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/mobile.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Mobile Deployment
on: [deployment_status, workflow_dispatch]
on: [deployment_status, workflow_dispatch]

jobs:
Setup:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
8 changes: 4 additions & 4 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Jinja2 = "==3.0.1"
[dev-packages]

[requires]
python_version = "3.10"
python_version = "3.12"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.project_slug}}/.github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ premailer = "*"
drf-spectacular = "*"

[requires]
python_version = "3.10"
python_version = "3.12"

[dev-packages]
# Code quality
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/compose/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.10.7
python-3.12.7

0 comments on commit cbc353c

Please sign in to comment.