Merge pull request #15 from texas/django-upgrade

Django upgrade

example/project/settings.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
 # Django settings for example project.
 
 # Setup a ``project_dir`` function
@@ -97,7 +100,7 @@
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'example.urls'
+# ROOT_URLCONF = 'example.project.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'example.wsgi.application'
@@ -121,9 +124,6 @@
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
 
-    # Third-party dependencies
-    'south',
-
     # Custom application being tested
     'tx_people',
 

example/project/urls.py

@@ -1,9 +1,7 @@
-try:
-    from django.conf.urls import patterns, include, url
-except ImportError:
-    # We get here with Django 1.3.x.  You can safely remove this if
-    # your application only supports Django >= 1.4
-    from django.conf.urls.defaults import patterns, include, url
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
+from django.conf.urls import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin

example/requirements.txt

@@ -1,6 +1,5 @@
-Django>=1.4.2
-South>=0.8.3
-dj-database-url==0.2.1
+Django>=1.9.4
+dj-database-url==0.4.0
 dj-settings-helpers==1.0.0
-factory-boy==2.1.2
+factory-boy==2.6.1
 -r ../requirements.txt

requirements.txt

@@ -1,3 +1,3 @@
 django-appconf>=0.6
 django-model-utils>=1.4.0,<2.0
-Pillow==2.5.1
+Pillow==3.1.1

setup.py

@@ -27,7 +27,7 @@
 
 setup(
     name='tx_people',
-    version='1.3.0',
+    version='2.0.0',
     description='Texas Tribune: tx_people',
     author='Tribune Tech',
     author_email='tech@texastribune.org',

tx_people/fields.py

@@ -58,7 +58,6 @@ class OptionalManyToManyField(models.ManyToManyField):
     def __init__(self, *args, **kwargs):
         defaults = {
             'blank': True,
-            'null': True,
         }
         defaults.update(**kwargs)
         return super(OptionalManyToManyField, self).__init__(*args, **defaults)

tx_people/migrations/0002_auto_20160329_0155.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-03-29 06:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import tx_people.fields
+import tx_people.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tx_people', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organization',
+            name='name',
+            field=models.CharField(db_index=True, max_length=250),
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='name',
+            field=models.CharField(db_index=True, max_length=250),
+        ),
+        migrations.AlterIndexTogether(
+            name='identifier',
+            index_together=set([('identifier', 'scheme')]),
+        ),
+    ]

tx_people/mixins.py

@@ -71,7 +71,7 @@ class NameMixin(models.Model):
         class Meta:
             abstract = True
 
-        name = models.CharField(max_length=250)
+        name = models.CharField(max_length=250, db_index=True)
         other_name = fields.OptionalManyToManyField('OtherNames',
                 related_name=related_name)
 

tx_people/models.py

@@ -57,6 +57,9 @@ class Identifier(models.Model):
 
     objects = InheritanceManager()
 
+    class Meta:
+        index_together = ('identifier', 'scheme',)
+
     def __unicode__(self):
         return u'{scheme}://{identifier}'.format(scheme=self.scheme,
                 identifier=self.identifier)