From 002b3eaf4100c02d9045f5953157754699e60777 Mon Sep 17 00:00:00 2001 From: areski Date: Thu, 4 Feb 2021 16:52:45 +0100 Subject: [PATCH 1/4] Update Django 3.0.11 to 3.1.6 --- tests/test_docker.sh | 2 +- .../requirements/base.txt | 2 +- .../0004_alter_options_ordering_domain.py | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py diff --git a/tests/test_docker.sh b/tests/test_docker.sh index 740f8fc2..f6df6b8a 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -30,4 +30,4 @@ docker-compose -f local.yml run django pytest docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; } # Test support for translations -docker-compose -f local.yml run django python manage.py makemessages +docker-compose -f local.yml run django python manage.py makemessages --all diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index b2eaa48e..1bb92817 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ +django==3.1.6 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py new file mode 100644 index 00000000..ffc88bf5 --- /dev/null +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.6 on 2021-02-04 14:49 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('sites', '0003_set_site_domain_and_name'), + ] + + operations = [ + migrations.AlterModelOptions( + name='site', + options={'ordering': ['domain'], 'verbose_name': 'site', 'verbose_name_plural': 'sites'}, + ), + ] From b2fa8b1b182f6b456e10870739652ec6b3045a45 Mon Sep 17 00:00:00 2001 From: areski Date: Thu, 4 Feb 2021 19:07:31 +0100 Subject: [PATCH 2/4] Update Readme for support Django 3.1 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index dbc510a4..ae869950 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ production-ready Django projects quickly. Features --------- -* For Django 3.0 +* For Django 3.1 * Works with Python 3.8 * Renders Django projects with 100% starting test coverage * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available) From 39033fa8abb1c9cbb5895c498c5c829f35e82850 Mon Sep 17 00:00:00 2001 From: areski Date: Thu, 4 Feb 2021 19:09:09 +0100 Subject: [PATCH 3/4] Fix pyup for Django 3.1 --- {{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 1bb92817..3efa6170 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.1.6 # pyup: < 3.1 # https://www.djangoproject.com/ +django==3.1.6 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth From 86f79e08b2153c79b423d78247f3a0988b5a993b Mon Sep 17 00:00:00 2001 From: areski Date: Sun, 21 Feb 2021 17:55:05 +0100 Subject: [PATCH 4/4] Update Django to 3.1.7 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- .../sites/migrations/0004_alter_options_ordering_domain.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 3efa6170..7ded74df 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.1.6 # pyup: < 3.2 # https://www.djangoproject.com/ +django==3.1.7 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py index ffc88bf5..00c9a74d 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.6 on 2021-02-04 14:49 +# Generated by Django 3.1.7 on 2021-02-04 14:49 from django.db import migrations