Merge pull request #37 from cookiecutter/master

update to upstream v`2022.04.25`

CHANGELOG.md

@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.04.25
+
+### Updated
+- Update pytest to 7.1.2 ([#3683](https://github.com/cookiecutter/cookiecutter-django/pull/3683))
+
 ## 2022.04.19
 
 ### Updated

requirements.txt

@@ -13,7 +13,7 @@ pre-commit==2.18.1
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.25.0
-pytest==7.1.1
+pytest==7.1.2
 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.04.19"
+version = "2022.04.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

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

@@ -20,7 +20,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.942  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.1  # https://github.com/pytest-dev/pytest
+pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs