From 5521718cef58f03689e578dab7f81a27d8ab273d Mon Sep 17 00:00:00 2001 From: Jacob Sayles Date: Tue, 21 Apr 2015 09:42:48 -0700 Subject: [PATCH] django 1.8 upgrade --- .../migrations/0002_auto_20150421_0933.py | 24 ++++++++++++ arpwatch/models.py | 4 +- .../migrations/0002_auto_20150421_0930.py | 24 ++++++++++++ nadine/migrations/0005_auto_20150421_0930.py | 38 +++++++++++++++++++ nadine/models.py | 6 +-- requirements.txt | 25 ++++++------ staff/admin.py | 2 +- tablet/admin.py | 2 +- urls.py | 10 ++--- 9 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 arpwatch/migrations/0002_auto_20150421_0933.py create mode 100644 interlink/migrations/0002_auto_20150421_0930.py create mode 100644 nadine/migrations/0005_auto_20150421_0930.py diff --git a/arpwatch/migrations/0002_auto_20150421_0933.py b/arpwatch/migrations/0002_auto_20150421_0933.py new file mode 100644 index 000000000..f91d2e024 --- /dev/null +++ b/arpwatch/migrations/0002_auto_20150421_0933.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('arpwatch', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='arplog', + name='ip_address', + field=models.GenericIPAddressField(db_index=True), + ), + migrations.AlterField( + model_name='userremoteaddr', + name='ip_address', + field=models.GenericIPAddressField(), + ), + ] diff --git a/arpwatch/models.py b/arpwatch/models.py index a4a6a468c..791993c37 100755 --- a/arpwatch/models.py +++ b/arpwatch/models.py @@ -30,7 +30,7 @@ def __unicode__(self): class UserRemoteAddr(models.Model): logintime = models.DateTimeField(blank=False) user = models.ForeignKey(User, blank=False, null=False, unique=False) - ip_address = models.IPAddressField(blank=False, null=False) + ip_address = models.GenericIPAddressField(blank=False, null=False) class Meta: ordering = ['-logintime'] @@ -72,7 +72,7 @@ def for_device(self, device_id): class ArpLog(models.Model): runtime = models.DateTimeField(blank=False, db_index=True) device = models.ForeignKey(UserDevice, null=False) - ip_address = models.IPAddressField(blank=False, null=False, db_index=True) + ip_address = models.GenericIPAddressField(blank=False, null=False, db_index=True) objects = ArpLog_Manager() diff --git a/interlink/migrations/0002_auto_20150421_0930.py b/interlink/migrations/0002_auto_20150421_0930.py new file mode 100644 index 000000000..ed68fd92d --- /dev/null +++ b/interlink/migrations/0002_auto_20150421_0930.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('interlink', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='incomingmail', + name='origin_address', + field=models.EmailField(max_length=254), + ), + migrations.AlterField( + model_name='mailinglist', + name='email_address', + field=models.EmailField(max_length=254), + ), + ] diff --git a/nadine/migrations/0005_auto_20150421_0930.py b/nadine/migrations/0005_auto_20150421_0930.py new file mode 100644 index 000000000..148a7ce7d --- /dev/null +++ b/nadine/migrations/0005_auto_20150421_0930.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals +from django.db import models, migrations +from django.conf import settings + +class Migration(migrations.Migration): + + dependencies = [ + ('nadine', '0004_auto_20150330_1157'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='email2', + field=models.EmailField(max_length=254, null=True, verbose_name=b'Alternate Email', blank=True), + ), + migrations.AlterField( + model_name='member', + name='user', + field=models.OneToOneField(related_name='user', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='sentemaillog', + name='recipient', + field=models.EmailField(max_length=254), + ), + migrations.AlterField( + model_name='bill', + name='dropins', + field=models.ManyToManyField(related_name='bills', to='nadine.DailyLog'), + ), + migrations.AlterField( + model_name='bill', + name='guest_dropins', + field=models.ManyToManyField(related_name='guest_bills', to='nadine.DailyLog'), + ), + ] diff --git a/nadine/models.py b/nadine/models.py index 013d2c7d9..cca7fd200 100755 --- a/nadine/models.py +++ b/nadine/models.py @@ -133,8 +133,8 @@ class Bill(models.Model): member = models.ForeignKey('Member', blank=False, null=False, related_name="bills") amount = models.DecimalField(max_digits=7, decimal_places=2) membership = models.ForeignKey('Membership', blank=True, null=True) - dropins = models.ManyToManyField('DailyLog', blank=True, null=True, related_name='bills') - guest_dropins = models.ManyToManyField('DailyLog', blank=True, null=True, related_name='guest_bills') + dropins = models.ManyToManyField('DailyLog', related_name='bills') + guest_dropins = models.ManyToManyField('DailyLog', related_name='guest_bills') new_member_deposit = models.BooleanField(default=False, blank=False, null=False) paid_by = models.ForeignKey('Member', blank=True, null=True, related_name='guest_bills') @@ -340,7 +340,7 @@ class Member(models.Model): """A person who has used the space and may or may not have a monthly membership""" objects = MemberManager() - user = models.ForeignKey(User, unique=True, blank=False, related_name="user") + user = models.OneToOneField(User, blank=False, related_name="user") email2 = models.EmailField("Alternate Email", blank=True, null=True) phone = PhoneNumberField(blank=True, null=True) phone2 = PhoneNumberField("Alternate Phone", blank=True, null=True) diff --git a/requirements.txt b/requirements.txt index 00e323bdb..1b0a2e916 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,21 @@ -Django>=1.7.4,<1.8 -MonthDelta==1.0b -Pillow==2.6.1 +Django>=1.8,<1.9 +Pillow==2.8.1 +psycopg2==2.6 celery==3.1.17 django-celery==3.1.16 -django-debug-toolbar==1.2.2 +django-debug-toolbar==1.3.0 django-localflavor-us==1.1 -django-taggit==0.12.2 -django-taggit-templatetags==0.4.6dev +django-taggit==0.13.0 +django-taggit-templatetags==0.2.5 django-tastypie==0.12.1 -feedparser==5.1.3 +feedparser==5.2.0 mailchimp==2.0.9 +MonthDelta==1.0b0 py4j==0.8.2.1 pycrypto==2.6.1 -pytz==2014.10 -psycopg2==2.5.4 - +pytz==2015.2 +requests==2.6.0 django-easy-pdf==0.1.0 -django-jsignature==0.7.6 +django-jsignature==0.8 xhtml2pdf>=0.0.6 reportlab>=2.7,<3 - -# Django-Gather -- not ready for prime time yet! -#git+https://git@github.com/opendoor/django-gather.git diff --git a/staff/admin.py b/staff/admin.py index 4b9a1b331..1e95521dc 100644 --- a/staff/admin.py +++ b/staff/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django import forms -from django.forms.util import ErrorList +from django.forms.utils import ErrorList from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin diff --git a/tablet/admin.py b/tablet/admin.py index 3454cd77a..bd58015c6 100755 --- a/tablet/admin.py +++ b/tablet/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django import forms -from django.forms.util import ErrorList +from django.forms.utils import ErrorList from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin diff --git a/urls.py b/urls.py index 4f7b84a1b..161dc0e2f 100644 --- a/urls.py +++ b/urls.py @@ -17,11 +17,11 @@ url(r'^cache\.manifest$', lambda r: HttpResponse(get_manifest(), content_type="text/plain")), url(r'^admin/', include(admin.site.urls)), - url(r'^staff/', include('staff.urls', app_name='staff')), - url(r'^member/', include('members.urls', app_name='members')), - url(r'^interlink/', include('interlink.urls', app_name='interlink')), - url(r'^logs/', include('arpwatch.urls', app_name='arpwatch')), - url(r'^tablet/', include('tablet.urls', app_name='tablet')), + url(r'^staff/', include('staff.urls')), + url(r'^member/', include('members.urls')), + url(r'^interlink/', include('interlink.urls')), + url(r'^logs/', include('arpwatch.urls')), + url(r'^tablet/', include('tablet.urls')), url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}), url(r'^logout/$', 'django.contrib.auth.views.logout_then_login'),