From a51c8d29618db4d2328191e922914aad7b1d9246 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 13 Jun 2022 14:17:46 -0500 Subject: [PATCH 1/4] Update cookiecutter to 2.1.1 (#3727) * Update cookiecutter from 1.7.3 to 2.1.1 * Fix postgreSQL versions in tests * Fix front-end pipeline choice in tests Co-authored-by: Bruno Alla --- requirements.txt | 2 +- tests/test_cookiecutter_generation.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index ea2455268..9d9ed4460 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==1.7.3 +cookiecutter==2.1.1 sh==1.14.2 binaryornot==0.4.4 diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 63b4fc97c..3a757fcb7 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -47,11 +47,11 @@ SUPPORTED_COMBINATIONS = [ {"use_pycharm": "n"}, {"use_docker": "y"}, {"use_docker": "n"}, - {"postgresql_version": "14.1"}, - {"postgresql_version": "13.5"}, - {"postgresql_version": "12.9"}, - {"postgresql_version": "11.14"}, - {"postgresql_version": "10.19"}, + {"postgresql_version": "14"}, + {"postgresql_version": "13"}, + {"postgresql_version": "12"}, + {"postgresql_version": "11"}, + {"postgresql_version": "10"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, @@ -88,7 +88,7 @@ SUPPORTED_COMBINATIONS = [ {"use_drf": "y"}, {"use_drf": "n"}, {"frontend_pipeline": "None"}, - {"frontend_pipeline": "django-compressor"}, + {"frontend_pipeline": "Django Compressor"}, {"frontend_pipeline": "Gulp"}, {"use_celery": "y"}, {"use_celery": "n"}, From c5f373d1f71fdefdb89b88f91232b47d39b0e064 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 14 Jun 2022 02:48:43 +0000 Subject: [PATCH 2/4] Release 2022.06.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba788a7f5..363e5bcc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.06.13 + +### Updated +- Update cookiecutter to 2.1.1 ([#3727](https://github.com/cookiecutter/cookiecutter-django/pull/3727)) + ## 2022.06.11 ### Updated diff --git a/setup.py b/setup.py index a15caee61..b0121827e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.11" +version = "2022.06.13" with open("README.rst") as readme_file: long_description = readme_file.read() From 570b77446eb5c8c57e97635359d94e4f7111864b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 15 Jun 2022 13:14:32 -0500 Subject: [PATCH 3/4] Update django-environ to 0.9.0 (#3751) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 54b510a2c..2d65dc0c0 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -30,7 +30,7 @@ uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ -django-environ==0.8.1 # https://github.com/joke2k/django-environ +django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms From 223dd6dc910cd9a5bcdca25ef0545223352662cc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 16 Jun 2022 02:45:20 +0000 Subject: [PATCH 4/4] Release 2022.06.15 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 363e5bcc2..16b67c921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.06.15 + +### Updated +- Update django-environ to 0.9.0 ([#3751](https://github.com/cookiecutter/cookiecutter-django/pull/3751)) + ## 2022.06.13 ### Updated diff --git a/setup.py b/setup.py index b0121827e..3f71a5d6d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.13" +version = "2022.06.15" with open("README.rst") as readme_file: long_description = readme_file.read()