Merge tag '0.8.2'

Conflicts: README.rst docs/changelog.rst
jazzband · Jul 1, 2015 · b92bfc6 · b92bfc6
2 parents d45431e + 3e1a47f
commit b92bfc6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -87,6 +87,7 @@ Roadmap / Todo list (help wanted)
 Changelog
 ---------
 
+
 master branch
 ~~~~~~~~~~~~~
 
@@ -95,6 +96,11 @@ master branch
 * #238: Fixed redirect uri handling in case of error
 * #229: Invalidate access tokens when getting a new refresh token
 
+0.8.2 [2015-06-25]
+~~~~~~~~~~~~~~~~~~
+
+* Fix the migrations to be two-step and allow upgrade from 0.7.2
+
 0.8.1 [2015-04-27]
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -10,6 +10,12 @@ master branch
 * #229: Invalidate access tokens when getting a new refresh token
 
 
+0.8.2 [2015-06-25]
+------------------
+
+* Fix the migrations to be two-step and allow upgrade from 0.7.2
+
+
 0.8.1 [2015-04-27]
 ------------------
 

diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.8.1'
+__version__ = '0.8.2'
 
 __author__ = "Massimiliano Pippi & Federico Frenguelli"
 

diff --git a/oauth2_provider/migrations/0001_initial.py b/oauth2_provider/migrations/0001_initial.py
@@ -26,8 +26,7 @@ class Migration(migrations.Migration):
                 ('authorization_grant_type', models.CharField(max_length=32, choices=[('authorization-code', 'Authorization code'), ('implicit', 'Implicit'), ('password', 'Resource owner password-based'), ('client-credentials', 'Client credentials')])),
                 ('client_secret', models.CharField(default=oauth2_provider.generators.generate_client_secret, max_length=255, db_index=True, blank=True)),
                 ('name', models.CharField(max_length=255, blank=True)),
-                ('skip_authorization', models.BooleanField(default=False)),
-                ('user', models.ForeignKey(related_name='oauth2_provider_application', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'abstract': False,
@@ -41,7 +40,7 @@ class Migration(migrations.Migration):
                 ('expires', models.DateTimeField()),
                 ('scope', models.TextField(blank=True)),
                 ('application', models.ForeignKey(to=oauth2_settings.APPLICATION_MODEL)),
-                ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(

diff --git a/oauth2_provider/migrations/0002_08_updates.py b/oauth2_provider/migrations/0002_08_updates.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from oauth2_provider.settings import oauth2_settings
+from django.db import models, migrations
+import oauth2_provider.validators
+import oauth2_provider.generators
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oauth2_provider', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+             model_name='Application',
+             name='skip_authorization',
+             field=models.BooleanField(default=False),
+             preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='Application',
+            name='user',
+            field=models.ForeignKey(related_name='oauth2_provider_application', to=settings.AUTH_USER_MODEL),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='AccessToken',
+            name='user',
+            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True),
+            preserve_default=True,
+        ),
+    ]