ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #60 from skirsdeda/develop

Browse source 
python 3.3 support
This commit is contained in:
Iacopo Spalletti 2014-12-11 07:37:55 +01:00
commit 567e1d0c0c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
djangocms_blog/migrations/0001_initial.py
View file

@ -90,7 +90,7 @@ class Migration(migrations.Migration):
('enable_comments', models.BooleanField(default=True, verbose_name='Enable comments on post')),
('author', models.ForeignKey(related_name='djangocms_blog_post_author', verbose_name='Author', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
('categories', models.ManyToManyField(related_name='blog_posts', verbose_name='category', to='djangocms_blog.BlogCategory')),
('content', cms.models.fields.PlaceholderField(slotname=b'post_content', editable=False, to='cms.Placeholder', null=True)),
('content', cms.models.fields.PlaceholderField(slotname='post_content', editable=False, to='cms.Placeholder', null=True)),
('main_image', filer.fields.image.FilerImageField(related_name='djangocms_blog_post_image', verbose_name='Main image', blank=True, to='filer.Image', null=True)),
('main_image_full', models.ForeignKey(related_name='djangocms_blog_post_full', verbose_name='Main image full', blank=True, to='cmsplugin_filer_image.ThumbnailOption', null=True)),
('main_image_thumbnail', models.ForeignKey(related_name='djangocms_blog_post_thumbnail', verbose_name='Main image thumbnail', blank=True, to='cmsplugin_filer_image.ThumbnailOption', null=True)),

7
setup.py
View file

@ -23,6 +23,7 @@ if sys.argv[-1] == 'publish':
readme = open('README.rst').read()
history = open('HISTORY.rst').read().replace('.. :changelog:', '')
setup(
name='djangocms-blog',
version=version,
@ -40,7 +41,7 @@ setup(
'django-cms>=3.0',
'django-taggit',
'django-filer',
'django-select2',
'django-select2' if sys.version_info[0]==2 else 'django-select2-py3',
'pytz',
'django-taggit-templatetags',
'django-taggit-autosuggest',
@ -49,7 +50,7 @@ setup(
'cmsplugin-filer',
'django-meta>=0.2',
'django-meta-mixin>=0.1.1',
'south>=1.0.1',
'south>=1.0.1',
],
license="BSD",
zip_safe=False,
@ -63,5 +64,7 @@ setup(
"Programming Language :: Python :: 2",
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
],
)