spacecruft
/
satnogs-db
1
0
Fork 0
Code Releases Activity

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 <cshields@gmail.com>
merge-requests/432/head
Corey Shields 2019-10-10 19:17:23 -04:00
parent e7e400e49a
commit 72e5d728a2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth0login/urls.py
View File

@ -5,6 +5,6 @@ from . import views
urlpatterns = [ urlpatterns = [
url('^$', views.index), url('^$', views.index),
url(r'^', include('django.contrib.auth.urls', namespace='auth')), url(r'^', include(('django.contrib.auth.urls', 'auth'), namespace='auth')),
url(r'^', include('social_django.urls', namespace='social')), url(r'^', include(('social_django.urls', 'social'), namespace='social')),
] ]

4
db/base/migrations/0001_initial.py
View File

@ -54,7 +54,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Suggestion', name='Suggestion',
fields=[ 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)), ('citation', models.CharField(max_length=255, blank=True)),
], ],
bases=('base.transmitter',), bases=('base.transmitter',),
@ -67,7 +67,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='transmitter', model_name='transmitter',
name='satellite', 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( migrations.AddField(
model_name='suggestion', model_name='suggestion',

4
requirements.txt
View File

@ -10,7 +10,7 @@ certifi==2019.9.11
chardet==3.0.4 chardet==3.0.4
defusedxml==0.6.0 defusedxml==0.6.0
dj-database-url==0.5.0 dj-database-url==0.5.0
Django==1.11.25 Django==2.2.6
django-allauth==0.40.0 django-allauth==0.40.0
django-appconf==1.0.3 django-appconf==1.0.3
django-avatar==4.1.0 django-avatar==4.1.0
@ -48,7 +48,7 @@ python3-openid==3.1.0
pytz==2019.3 pytz==2019.3
PyYAML==5.1.2 PyYAML==5.1.2
rcssmin==1.0.6 rcssmin==1.0.6
redis==3.3.8 redis==3.3.9
requests==2.22.0 requests==2.22.0
requests-oauthlib==1.2.0 requests-oauthlib==1.2.0
rjsmin==1.1.0 rjsmin==1.1.0

2
setup.cfg
View File

@ -24,7 +24,7 @@ packages = find:
include_package_data = True include_package_data = True
install_requires = install_requires =
# Basic # Basic
Django~=1.11.0 Django~=2.2.0
django-shortuuidfield~=0.1.0 django-shortuuidfield~=0.1.0
django-jsonfield~=1.3.0 django-jsonfield~=1.3.0
celery~=4.3.0 celery~=4.3.0