From e05122e4b357d526f04034ba10bf16300ac9c5c3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Apr 2023 15:31:01 -0500 Subject: [PATCH 1/3] Update sentry-sdk to 1.19.0 (#4254) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 7d3634d4b..42cdbf53f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.17.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.19.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From f93a9f78d9a249718acd20e297fb02b177353912 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 4 Apr 2023 22:42:53 +0200 Subject: [PATCH 2/3] Replace `runserver_plus` with `runserver` (#4255) * Replace runserver_plus with runserver since it is not compatible with django >= 4.1 * Replace runserver_plus with runserver in post_gen_hooks --------- Co-authored-by: Bruno Alla --- hooks/post_gen_project.py | 2 +- .../runConfigurations/runserver_plus.xml | 33 ------------------- .../compose/local/django/start | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index dbc367175..b28bb0166 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -182,7 +182,7 @@ def handle_js_runner(choice, use_docker, use_async): dev_django_cmd = ( "uvicorn config.asgi:application --reload" if use_async - else "python manage.py runserver_plus" + else "python manage.py runserver" ) scripts.update( { diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml deleted file mode 100644 index 242f861a6..000000000 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index ec57dc8e4..6415d7fb4 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -9,5 +9,5 @@ python manage.py migrate {%- if cookiecutter.use_async == 'y' %} exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} -exec python manage.py runserver_plus 0.0.0.0:8000 +exec python manage.py runserver 0.0.0.0:8000 {%- endif %} From a07b4b31125534bff0689355b72fe124925b80f1 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 4 Apr 2023 23:10:17 +0200 Subject: [PATCH 3/3] Upgrade to Django 4.1 (#4028) * Upgrade to Django 4.1 * Bump django-environ back to 0.10.0 --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- README.md | 2 +- setup.py | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aaeb25828..d951c7a21 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 4.0 +- For Django 4.1 - Works with Python 3.10 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 diff --git a/setup.py b/setup.py index 334bd2906..8155fd234 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 4.0", + "Framework :: Django :: 4.1", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index fb3559194..6cce06457 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ +django==4.1.7 # pyup: < 4.2 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.54.0 # https://github.com/pennersr/django-allauth