Merge branch 'cookiecutter-master' 20221027

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.0
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -102,7 +102,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements.txt

.github/workflows/django-issue-checker.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/pre-commit-autoupdate.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install pre-commit
         run: pip install pre-commit

.github/workflows/update-changelog.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/update-contributors.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.1
+        uses: stefanzweifel/git-auto-commit-action@v4.15.2
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
         exclude: hooks/
 
   - repo: https://github.com/psf/black

CHANGELOG.md

@@ -3,6 +3,22 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.26
+
+### Updated
+- Update uvicorn to 0.19.0 ([#3920](https://github.com/cookiecutter/cookiecutter-django/pull/3920))
+- Update pytest to 7.2.0 ([#3919](https://github.com/cookiecutter/cookiecutter-django/pull/3919))
+- Update tox to 3.27.0 ([#3917](https://github.com/cookiecutter/cookiecutter-django/pull/3917))
+- Update psycopg2 to 2.9.5 ([#3918](https://github.com/cookiecutter/cookiecutter-django/pull/3918))
+
+## 2022.10.24
+
+### Changed
+- Upgrade Python version from 3.9 to 3.10 ([#3913](https://github.com/cookiecutter/cookiecutter-django/pull/3913))
+### Updated
+- Update sentry-sdk to 1.10.1 ([#3911](https://github.com/cookiecutter/cookiecutter-django/pull/3911))
+- Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 ([#3914](https://github.com/cookiecutter/cookiecutter-django/pull/3914))
+
 ## 2022.10.19
 
 ### Changed

CONTRIBUTING.md

@@ -33,7 +33,7 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is:
 
-    $ tox -e py39
+    $ tox -e py310
 
 This will run pytest with the python3.9 interpreter, for example.
 

README.md

@@ -18,7 +18,7 @@ production-ready Django projects quickly.
 ## Features
 
 -   For Django 4.0
--   Works with Python 3.9
+-   Works with Python 3.10
 -   Renders Django projects with 100% starting test coverage
 -   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
 -   [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)

docs/deployment-on-pythonanywhere.rst

@@ -34,7 +34,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.9 my-project-name
+    mkvirtualenv --python=/usr/bin/python3.10 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 

docs/developing-locally.rst

@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.9
+* Python 3.10
 * PostgreSQL_.
 * Redis_, if using Celery
 * Cookiecutter_
@@ -18,7 +18,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.9 -m venv <virtual env path>
+    $ python3.10 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 

hooks/pre_gen_project.py

@@ -36,7 +36,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.9+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.10+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:

requirements.txt

@@ -12,8 +12,8 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.26.0
-pytest==7.1.3
+tox==3.27.0
+pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0

setup.py

@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.19"
+version = "2022.10.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()
@@ -33,7 +33,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py39,black-template
+envlist = py310,black-template
 
 [testenv]
 deps = -rrequirements.txt

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

@@ -29,7 +29,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements/base.txt
@@ -87,7 +87,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements/base.txt

{{cookiecutter.project_slug}}/.gitlab-ci.yml

@@ -13,7 +13,7 @@ variables:
 
 flake8:
   stage: lint
-  image: python:3.9-alpine
+  image: python:3.10-alpine
   before_script:
     - pip install -q flake8
   script:
@@ -35,7 +35,7 @@ pytest:
   script:
     - docker-compose -f local.yml run django pytest
   {%- else -%}
-  image: python:3.9
+  image: python:3.10
   tags:
     - python
   services:

{{cookiecutter.project_slug}}/.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
 
   - repo: https://github.com/psf/black
     rev: 22.10.0

{{cookiecutter.project_slug}}/.readthedocs.yml

@@ -7,6 +7,6 @@ build:
   image: testing
 
 python:
-  version: 3.9
+  version: 3.10
   install:
     - requirements: requirements/local.txt

{{cookiecutter.project_slug}}/.travis.yml

@@ -2,7 +2,7 @@ dist: focal
 
 language: python
 python:
-  - "3.9"
+  - "3.10"
 
 services:
   - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %}
@@ -37,7 +37,7 @@ jobs:
         - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
       language: python
       python:
-        - "3.9"
+        - "3.10"
       install:
         - pip install -r requirements/local.txt
       script:

{{cookiecutter.project_slug}}/compose/local/django/Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python

{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python

{{cookiecutter.project_slug}}/compose/production/django/Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 {% if cookiecutter.frontend_pipeline == 'Gulp' -%}
 FROM node:16-bullseye-slim as client-builder

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.19.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -3,9 +3,9 @@
 Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
@@ -15,7 +15,7 @@ watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.3  # https://github.com/pytest-dev/pytest
+pytest==7.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -3,12 +3,12 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.10  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.10.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py

{{cookiecutter.project_slug}}/runtime.txt

@@ -1 +1 @@
-python-3.9.13
+python-3.10.8

{{cookiecutter.project_slug}}/setup.cfg

@@ -18,7 +18,7 @@ force_grid_wrap = 0
 use_parentheses = true
 
 [mypy]
-python_version = 3.9
+python_version = 3.10
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True