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/7] 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/7] 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/7] 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/7] 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() From d3c3cd5ff5d0fc669128aacb7555750e02e4bf8b Mon Sep 17 00:00:00 2001 From: Abdullah Adeel Date: Sun, 19 Jun 2022 12:05:03 +0500 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=9B=A2=20update=20`postgres`=20and=20?= =?UTF-8?q?`mysql`=20db=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 12 ++++++------ cookiecutter.json | 2 +- tests/test_cookiecutter_generation.py | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c89b2f7d6..bbb6c59c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,13 @@ jobs: matrix: script: - name: Basic - Postgres - args: "database_engine=postgresql database_version='postgresql@14.1'" + args: "database_engine=postgresql database_version='postgresql@14'" - name: Extended - Postgres - args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=postgresql database_version='postgresql@14.1'" + args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=postgresql database_version='postgresql@14'" - name: Basic - MySQL - args: "database_engine=mysql database_version='mysql@8.0.28'" + args: "database_engine=mysql database_version='mysql@8.0.29'" - name: Extended - MySQL - args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=mysql database_version='mysql@8.0.28'" + args: "use_celery=y use_drf=y frontend_pipeline=Gulp database_engine=mysql database_version='mysql@8.0.29'" name: "${{ matrix.script.name }} Docker" runs-on: ubuntu-latest @@ -79,11 +79,11 @@ jobs: matrix: script: - name: With Celery - args: "use_celery=y frontend_pipeline='Django Compressor' database_engine=postgresql database_version=postgresql@14.1" + args: "use_celery=y frontend_pipeline='Django Compressor' database_engine=postgresql database_version=postgresql@14" # postgres://user:password@host:port/database database_url: "postgres://postgres:postgres@localhost:5432/postgres" - name: With Gulp - args: "frontend_pipeline='Gulp' custom_bootstrap_compilation=y database_engine=postgresql database_version=postgresql@14.1" + args: "frontend_pipeline='Gulp' custom_bootstrap_compilation=y database_engine=postgresql database_version=postgresql@14" database_url: "postgres://postgres:postgres@localhost:5432/postgres" name: "${{ matrix.script.name }} Bare metal" diff --git a/cookiecutter.json b/cookiecutter.json index 8f0bdd003..7d402027f 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -24,7 +24,7 @@ "postgresql@12", "postgresql@11", "postgresql@10", - "mysql@8.0.28", + "mysql@8.0.29", "mysql@8.0", "mysql@5.7" ], diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index d30974e9c..256ff6749 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -52,7 +52,7 @@ SUPPORTED_COMBINATIONS = [ {"database_engine": "postgresql", "database_version": "postgresql@12"}, {"database_engine": "postgresql", "database_version": "postgresql@11"}, {"database_engine": "postgresql", "database_version": "postgresql@10"}, - {"database_engine": "mysql", "database_version": "mysql@8.0.28"}, + {"database_engine": "mysql", "database_version": "mysql@8.0.29"}, {"database_engine": "mysql", "database_version": "mysql@8.0"}, {"database_engine": "mysql", "database_version": "mysql@5.7"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, @@ -117,14 +117,14 @@ UNSUPPORTED_COMBINATIONS = [ {"cloud_provider": "None", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "mail_service": "Amazon SES"}, {"cloud_provider": "None", "mail_service": "Amazon SES"}, - {"database_engine": "postgresql", "database_version": "mysql@8.0.28"}, + {"database_engine": "postgresql", "database_version": "mysql@8.0.29"}, {"database_engine": "postgresql", "database_version": "mysql@8.0"}, {"database_engine": "postgresql", "database_version": "mysql@5.7"}, - {"database_engine": "mysql", "database_version": "postgresql@14.1"}, - {"database_engine": "mysql", "database_version": "postgresql@13.5"}, - {"database_engine": "mysql", "database_version": "postgresql@12.9"}, - {"database_engine": "mysql", "database_version": "postgresql@11.14"}, - {"database_engine": "mysql", "database_version": "postgresql@10.19"}, + {"database_engine": "mysql", "database_version": "postgresql@14"}, + {"database_engine": "mysql", "database_version": "postgresql@13"}, + {"database_engine": "mysql", "database_version": "postgresql@12"}, + {"database_engine": "mysql", "database_version": "postgresql@11"}, + {"database_engine": "mysql", "database_version": "postgresql@10"}, ] From 2ac422be84ae2a2786b2eeaa804223920f71fb6c Mon Sep 17 00:00:00 2001 From: Abdullah Adeel Date: Fri, 24 Jun 2022 10:19:12 +0500 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=94=BD=20downgrade=20`cookiecutter`?= =?UTF-8?q?=20to=20`v1`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9d9ed4460..ea2455268 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==2.1.1 +cookiecutter==1.7.3 sh==1.14.2 binaryornot==0.4.4 From 0aa545a0f614a6387c9304c66980b7bafd2ce5be Mon Sep 17 00:00:00 2001 From: Abdullah Adeel Date: Fri, 24 Jun 2022 11:11:06 +0500 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=94=BC=20updated=20`cookiecutter`=20t?= =?UTF-8?q?o=20v2=20a/=20fixed=20`jinja`=20template=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cookiecutter.json | 2 -- requirements.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index 7d402027f..e771ed971 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -28,8 +28,6 @@ "mysql@8.0", "mysql@5.7" ], - "__processed_database_engine": "{{ cookiecutter.database_version.lower()|split('@')[0] }}", - "__processed_database_version": "{{ cookiecutter.database_version.lower()|split('@')[1] }}", "cloud_provider": ["AWS", "GCP", "None"], "mail_service": [ "Mailgun", 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