From 8cae425ac9cc6b12d635f7dd0a35ee0ff8dea9ef Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Thu, 10 Oct 2019 19:17:23 -0400 Subject: [PATCH] Django 2.2(.6) upgrade This change bumps DB up to django 2.2.6 and resolves dependencies. No migrations are necessary. I've tested in my own environment, time to test in db-dev! Signed-off-by: Corey Shields --- db/base/migrations/0001_initial.py | 4 ++-- requirements.txt | 4 ++-- setup.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/db/base/migrations/0001_initial.py b/db/base/migrations/0001_initial.py index 89c0ef2..5674f06 100644 --- a/db/base/migrations/0001_initial.py +++ b/db/base/migrations/0001_initial.py @@ -54,7 +54,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Suggestion', fields=[ - ('transmitter_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='base.Transmitter')), + ('transmitter_ptr', models.OneToOneField(parent_link=True, on_delete=django.db.models.deletion.CASCADE, auto_created=True, primary_key=True, serialize=False, to='base.Transmitter')), ('citation', models.CharField(max_length=255, blank=True)), ], bases=('base.transmitter',), @@ -67,7 +67,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='transmitter', name='satellite', - field=models.ForeignKey(related_name='transmitters', to='base.Satellite', null=True), + field=models.ForeignKey(related_name='transmitters', on_delete=django.db.models.deletion.SET_NULL, to='base.Satellite', null=True), ), migrations.AddField( model_name='suggestion', diff --git a/requirements.txt b/requirements.txt index b4fbe81..91c6038 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ certifi==2019.9.11 chardet==3.0.4 defusedxml==0.6.0 dj-database-url==0.5.0 -Django==1.11.25 +Django==2.2.6 django-allauth==0.40.0 django-appconf==1.0.3 django-avatar==4.1.0 @@ -48,7 +48,7 @@ python3-openid==3.1.0 pytz==2019.3 PyYAML==5.1.2 rcssmin==1.0.6 -redis==3.3.8 +redis==3.3.9 requests==2.22.0 requests-oauthlib==1.2.0 rjsmin==1.1.0 diff --git a/setup.cfg b/setup.cfg index 1c152f7..a328d7e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ packages = find: include_package_data = True install_requires = # Basic - Django~=1.11.0 + Django~=2.2.0 django-shortuuidfield~=0.1.0 django-jsonfield~=1.3.0 celery~=4.3.0