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/CHANGELOG.md b/CHANGELOG.md index ba788a7f5..16b67c921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ 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 +- Update cookiecutter to 2.1.1 ([#3727](https://github.com/cookiecutter/cookiecutter-django/pull/3727)) + ## 2022.06.11 ### Updated diff --git a/cookiecutter.json b/cookiecutter.json index 8f0bdd003..e771ed971 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -24,12 +24,10 @@ "postgresql@12", "postgresql@11", "postgresql@10", - "mysql@8.0.28", + "mysql@8.0.29", "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 diff --git a/setup.py b/setup.py index a15caee61..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.11" +version = "2022.06.15" with open("README.rst") as readme_file: long_description = readme_file.read() diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 8dd58d284..256ff6749 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -47,12 +47,12 @@ SUPPORTED_COMBINATIONS = [ {"use_pycharm": "n"}, {"use_docker": "y"}, {"use_docker": "n"}, - {"database_engine": "postgresql", "database_version": "postgresql@14.1"}, - {"database_engine": "postgresql", "database_version": "postgresql@13.5"}, - {"database_engine": "postgresql", "database_version": "postgresql@12.9"}, - {"database_engine": "postgresql", "database_version": "postgresql@11.14"}, - {"database_engine": "postgresql", "database_version": "postgresql@10.1 9"}, - {"database_engine": "mysql", "database_version": "mysql@8.0.28"}, + {"database_engine": "postgresql", "database_version": "postgresql@14"}, + {"database_engine": "postgresql", "database_version": "postgresql@13"}, + {"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.29"}, {"database_engine": "mysql", "database_version": "mysql@8.0"}, {"database_engine": "mysql", "database_version": "mysql@5.7"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, @@ -91,7 +91,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"}, @@ -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"}, ] 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