Merge pull request #16 from WimpyAnalytics/1.7migrationfix

1.7migrationfix

HISTORY.rst

@@ -3,6 +3,10 @@
 History
 -------
 
+1.2.2 (2014-12-04)
+------------------
+Fixed a bug where the Django 1.7.x migration for recent DB changes was somehow missed.
+
 1.2.1 (2014-12-02)
 ------------------
 The author is now selectable when editing entries in the admin.

MANIFEST.in

@@ -6,7 +6,6 @@ include AUTHORS.rst
 recursive-include andablog *
 recursive-include demo *
 recursive-include docs *.rst conf.py Makefile make.bat
-recursive-include docs/_static *
 
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

andablog/__init__.py

@@ -1 +1 @@
-__version__ = '1.2.1'
+__version__ = '1.2.2'

andablog/migrations/0002_auto_20141204_1659.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0001_initial'),
+        ('andablog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='entry',
+            name='tags',
+            field=taggit.managers.TaggableManager(to='taggit.Tag', through='taggit.TaggedItem', blank=True, help_text='A comma-separated list of tags.', verbose_name='Tags'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='entry',
+            name='author',
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True),
+        ),
+    ]

docs/conf.py

@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.1'
+version = '1.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.1'
+release = '1.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -137,7 +137,6 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

setup.py

@@ -26,13 +26,13 @@
 
 setup(
     name='django-andablog',
-    version='1.2.1',
+    version='1.2.2',
     description='A blog app that is only intended to be embedded within an existing Django site.',
     long_description=readme + '\n\n' + history,
     author='Ivan Ven Osdel',
     author_email='ivan@wimpyanalytics.com',
     url='https://github.com/WimpyAnalytics/django-andablog',
-    download_url='https://github.com/wimpyanalytics/django-andablog/tarball/1.2.1',
+    download_url='https://github.com/wimpyanalytics/django-andablog/tarball/1.2.2',
     packages=[
         'andablog',
     ],