Administrator / django-contrib-comments · Commits

Commit 6574825c665ead5e2e9d70613937cb4a86a41852

Authored by Claude Paroz
1 parent a15b4dfb

Dropped Django 1.6 / Python 2.6

Inline Side-by-side
Showing 8 changed files with 6 additions and 244 deletions
1 language: python 1 language: python
2 python: 2 python:
3 - - "2.6"  
4 - "2.7" 3 - "2.7"
5 - "3.2" 4 - "3.2"
6 - "3.3" 5 - "3.3"
7 - "3.4" 6 - "3.4"
8 env: 7 env:
9 - - DJANGO_PACKAGE="Django>=1.6,<1.7"  
10 - DJANGO_PACKAGE="Django>=1.7,<1.8" 8 - DJANGO_PACKAGE="Django>=1.7,<1.8"
11 - DJANGO_PACKAGE="Django>=1.8,<1.9" 9 - DJANGO_PACKAGE="Django>=1.8,<1.9"
12 - DJANGO_PACKAGE="Django<1.10" 10 - DJANGO_PACKAGE="Django<1.10"
13 11
14 matrix: 12 matrix:
15 exclude: 13 exclude:
16 - - python: "2.6"  
17 - env: DJANGO_PACKAGE="Django>=1.7,<1.8"  
18 - - python: "2.6"  
19 - env: DJANGO_PACKAGE="Django>=1.8,<1.9"  
20 - - python: "2.6"  
21 - env: DJANGO_PACKAGE="Django<1.10"  
22 - python: "3.2" 14 - python: "3.2"
23 env: DJANGO_PACKAGE="Django<1.10" 15 env: DJANGO_PACKAGE="Django<1.10"
24 - python: "3.3" 16 - python: "3.3"
25 env: DJANGO_PACKAGE="Django<1.10" 17 env: DJANGO_PACKAGE="Django<1.10"
26 - - python: "3.4"  
27 - env: DJANGO_PACKAGE="Django>=1.6,<1.7"  
28 18
29 install: 19 install:
30 - pip install --pre $DJANGO_PACKAGE 20 - pip install --pre $DJANGO_PACKAGE
31 - - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi  
32 script: python setup.py test 21 script: python setup.py test
1 -# -*- coding: utf-8 -*-  
2 -from south.utils import datetime_utils as datetime  
3 -from south.db import db  
4 -from south.v2 import SchemaMigration  
5 -from django.db import models  
6 -from django.contrib.auth import get_user_model  
7 -  
8 -  
9 -User = get_user_model()  
10 -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name)  
11 -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name)  
12 -  
13 -  
14 -class Migration(SchemaMigration):  
15 -  
16 - def forwards(self, orm):  
17 - # Adding model 'Comment'  
18 - db.create_table('django_comments', (  
19 - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),  
20 - ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(related_name='content_type_set_for_comment', to=orm['contenttypes.ContentType'])),  
21 - ('object_pk', self.gf('django.db.models.fields.TextField')()),  
22 - ('site', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['sites.Site'])),  
23 - ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='comment_comments', null=True, to=orm[user_orm_label])),  
24 - ('user_name', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),  
25 - ('user_email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)),  
26 - ('user_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),  
27 - ('comment', self.gf('django.db.models.fields.TextField')(max_length=3000)),  
28 - ('submit_date', self.gf('django.db.models.fields.DateTimeField')(default=None)),  
29 - ('ip_address', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True, blank=True)),  
30 - ('is_public', self.gf('django.db.models.fields.BooleanField')(default=True)),  
31 - ('is_removed', self.gf('django.db.models.fields.BooleanField')(default=False)),  
32 - ))  
33 - db.send_create_signal(u'django_comments', ['Comment'])  
34 -  
35 - # Adding model 'CommentFlag'  
36 - db.create_table('django_comment_flags', (  
37 - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),  
38 - ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='comment_flags', to=orm[user_orm_label])),  
39 - ('comment', self.gf('django.db.models.fields.related.ForeignKey')(related_name='flags', to=orm['django_comments.Comment'])),  
40 - ('flag', self.gf('django.db.models.fields.CharField')(max_length=30, db_index=True)),  
41 - ('flag_date', self.gf('django.db.models.fields.DateTimeField')(default=None)),  
42 - ))  
43 - db.send_create_signal(u'django_comments', ['CommentFlag'])  
44 -  
45 - # Adding unique constraint on 'CommentFlag', fields ['user', 'comment', 'flag']  
46 - db.create_unique('django_comment_flags', ['user_id', 'comment_id', 'flag'])  
47 -  
48 -  
49 - def backwards(self, orm):  
50 - # Removing unique constraint on 'CommentFlag', fields ['user', 'comment', 'flag']  
51 - db.delete_unique('django_comment_flags', ['user_id', 'comment_id', 'flag'])  
52 -  
53 - # Deleting model 'Comment'  
54 - db.delete_table('django_comments')  
55 -  
56 - # Deleting model 'CommentFlag'  
57 - db.delete_table('django_comment_flags')  
58 -  
59 -  
60 - models = {  
61 - u'auth.group': {  
62 - 'Meta': {'object_name': 'Group'},  
63 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
64 - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),  
65 - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})  
66 - },  
67 - u'auth.permission': {  
68 - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},  
69 - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
70 - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),  
71 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
72 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})  
73 - },  
74 - user_model_label: {  
75 - 'Meta': {'object_name': User.__name__, 'db_table': "'{}'".format(User._meta.db_table)},  
76 - User._meta.pk.attname: ('django.db.models.fields.AutoField', [], {'primary_key': 'True', 'db_column': "'{}'".format(User._meta.pk.column)}),  
77 - },  
78 - u'contenttypes.contenttype': {  
79 - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},  
80 - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
81 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
82 - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
83 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})  
84 - },  
85 - u'django_comments.comment': {  
86 - 'Meta': {'ordering': "('submit_date',)", 'object_name': 'Comment', 'db_table': "'django_comments'"},  
87 - 'comment': ('django.db.models.fields.TextField', [], {'max_length': '3000'}),  
88 - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'content_type_set_for_comment'", 'to': u"orm['contenttypes.ContentType']"}),  
89 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
90 - 'ip_address': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),  
91 - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),  
92 - 'is_removed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),  
93 - 'object_pk': ('django.db.models.fields.TextField', [], {}),  
94 - 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sites.Site']"}),  
95 - 'submit_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),  
96 - 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comment_comments'", 'null': 'True', 'to': u"orm['{}']".format(user_orm_label)}),  
97 - 'user_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),  
98 - 'user_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),  
99 - 'user_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})  
100 - },  
101 - u'django_comments.commentflag': {  
102 - 'Meta': {'unique_together': "[('user', 'comment', 'flag')]", 'object_name': 'CommentFlag', 'db_table': "'django_comment_flags'"},  
103 - 'comment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'flags'", 'to': u"orm['django_comments.Comment']"}),  
104 - 'flag': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),  
105 - 'flag_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),  
106 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
107 - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'comment_flags'", 'to': u"orm['{}']".format(user_orm_label)})  
108 - },  
109 - u'sites.site': {  
110 - 'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"},  
111 - 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
112 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
113 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})  
114 - }  
115 - }  
116 -  
117 - complete_apps = ['django_comments']  
1 -# -*- coding: utf-8 -*-  
2 -from south.utils import datetime_utils as datetime  
3 -from south.db import db  
4 -from south.v2 import SchemaMigration  
5 -from django.db import models  
6 -  
7 -  
8 -class Migration(SchemaMigration):  
9 -  
10 - def forwards(self, orm):  
11 -  
12 - # Changing field 'Comment.user_email'  
13 - db.alter_column('django_comments', 'user_email', self.gf('django.db.models.fields.EmailField')(max_length=254))  
14 -  
15 - def backwards(self, orm):  
16 -  
17 - # Changing field 'Comment.user_email'  
18 - db.alter_column('django_comments', 'user_email', self.gf('django.db.models.fields.EmailField')(max_length=75))  
19 -  
20 - models = {  
21 - u'auth.group': {  
22 - 'Meta': {'object_name': 'Group'},  
23 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
24 - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),  
25 - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})  
26 - },  
27 - u'auth.permission': {  
28 - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},  
29 - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
30 - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),  
31 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
32 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})  
33 - },  
34 - u'auth.user': {  
35 - 'Meta': {'object_name': 'User'},  
36 - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),  
37 - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),  
38 - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),  
39 - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),  
40 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
41 - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),  
42 - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),  
43 - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),  
44 - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),  
45 - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),  
46 - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),  
47 - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),  
48 - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})  
49 - },  
50 - u'contenttypes.contenttype': {  
51 - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},  
52 - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
53 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
54 - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
55 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})  
56 - },  
57 - u'django_comments.comment': {  
58 - 'Meta': {'ordering': "('submit_date',)", 'object_name': 'Comment', 'db_table': "'django_comments'"},  
59 - 'comment': ('django.db.models.fields.TextField', [], {'max_length': '3000'}),  
60 - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'content_type_set_for_comment'", 'to': u"orm['contenttypes.ContentType']"}),  
61 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
62 - 'ip_address': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),  
63 - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),  
64 - 'is_removed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),  
65 - 'object_pk': ('django.db.models.fields.TextField', [], {}),  
66 - 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sites.Site']"}),  
67 - 'submit_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),  
68 - 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'comment_comments'", 'null': 'True', 'to': u"orm['auth.User']"}),  
69 - 'user_email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}),  
70 - 'user_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),  
71 - 'user_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})  
72 - },  
73 - u'django_comments.commentflag': {  
74 - 'Meta': {'unique_together': "[('user', 'comment', 'flag')]", 'object_name': 'CommentFlag', 'db_table': "'django_comment_flags'"},  
75 - 'comment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'flags'", 'to': u"orm['django_comments.Comment']"}),  
76 - 'flag': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}),  
77 - 'flag_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),  
78 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
79 - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'comment_flags'", 'to': u"orm['auth.User']"})  
80 - },  
81 - u'sites.site': {  
82 - 'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"},  
83 - 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),  
84 - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),  
85 - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})  
86 - }  
87 - }  
88 -  
89 - complete_apps = ['django_comments']  
@@ -49,9 +49,9 @@ copyright = u'2013, Django Software Foundation and contributors' @@ -49,9 +49,9 @@ copyright = u'2013, Django Software Foundation and contributors'
49 # built documents. 49 # built documents.
50 # 50 #
51 # The short X.Y version. 51 # The short X.Y version.
52 -version = '1.6' 52 +version = '1.7'
53 # The full version, including alpha/beta/rc tags. 53 # The full version, including alpha/beta/rc tags.
54 -release = '1.6' 54 +release = '1.7'
55 55
56 # The language for content autogenerated by Sphinx. Refer to documentation 56 # The language for content autogenerated by Sphinx. Refer to documentation
57 # for a list of supported languages. 57 # for a list of supported languages.
@@ -13,8 +13,7 @@ To get started using the ``comments`` app, follow these steps: @@ -13,8 +13,7 @@ To get started using the ``comments`` app, follow these steps:
13 #. Install the comments framework by adding ``'django_comments'`` to 13 #. Install the comments framework by adding ``'django_comments'`` to
14 :setting:`INSTALLED_APPS`. 14 :setting:`INSTALLED_APPS`.
15 15
16 -#. Run ``manage.py migrate`` (or ``manage.py syncdb`` on Django 1.6) so that  
17 - Django will create the comment tables. 16 +#. Run ``manage.py migrate`` so that Django will create the comment tables.
18 17
19 #. Add the comment app's URLs to your project's ``urls.py``: 18 #. Add the comment app's URLs to your project's ``urls.py``:
20 19
@@ -10,7 +10,7 @@ except IOError: @@ -10,7 +10,7 @@ except IOError:
10 10
11 setup( 11 setup(
12 name='django-contrib-comments', 12 name='django-contrib-comments',
13 - version='1.6.2', 13 + version='1.7.0.dev1',
14 url="https://github.com/django/django-contrib-comments", 14 url="https://github.com/django/django-contrib-comments",
15 description='The code formerly known as django.contrib.comments.', 15 description='The code formerly known as django.contrib.comments.',
16 long_description=long_description, 16 long_description=long_description,
@@ -28,7 +28,6 @@ setup( @@ -28,7 +28,6 @@ setup(
28 'License :: OSI Approved :: BSD License', 28 'License :: OSI Approved :: BSD License',
29 'Operating System :: OS Independent', 29 'Operating System :: OS Independent',
30 'Programming Language :: Python', 30 'Programming Language :: Python',
31 - 'Programming Language :: Python :: 2.6',  
32 'Programming Language :: Python :: 2.7', 31 'Programming Language :: Python :: 2.7',
33 'Programming Language :: Python :: 3', 32 'Programming Language :: Python :: 3',
34 'Programming Language :: Python :: 3.2', 33 'Programming Language :: Python :: 3.2',
@@ -38,5 +37,5 @@ setup( @@ -38,5 +37,5 @@ setup(
38 packages=find_packages(exclude=['tests']), 37 packages=find_packages(exclude=['tests']),
39 include_package_data=True, 38 include_package_data=True,
40 test_suite='tests.runtests.main', 39 test_suite='tests.runtests.main',
41 - install_requires=['Django>=1.6'] 40 + install_requires=['Django>=1.7']
42 ) 41 )
1 [tox] 1 [tox]
2 -envlist = py26-django16, py27-django16, py32-django16, py33-django16,  
3 - py27-django17, py32-django17, py33-django17, 2 +envlist = py27-django17, py32-django17, py33-django17,
4 py27-django18, py32-django18, py33-django18, 3 py27-django18, py32-django18, py33-django18,
5 py27-django19, py34-django19 4 py27-django19, py34-django19
6 5
@@ -9,24 +8,6 @@ commands = {envpython} setup.py test @@ -9,24 +8,6 @@ commands = {envpython} setup.py test
9 setenv= 8 setenv=
10 PYTHONWARNINGS=default 9 PYTHONWARNINGS=default
11 10
12 -[testenv:py26-django16]  
13 -basepython = python2.6  
14 -deps =  
15 - Django>=1.6,<1.7  
16 - unittest2  
17 -  
18 -[testenv:py27-django16]  
19 -basepython = python2.7  
20 -deps = Django>=1.6,<1.7  
21 -  
22 -[testenv:py32-django16]  
23 -basepython = python3.2  
24 -deps = Django>=1.6,<1.7  
25 -  
26 -[testenv:py33-django16]  
27 -basepython = python3.3  
28 -deps = Django>=1.6,<1.7  
29 -  
30 [testenv:py27-django17] 11 [testenv:py27-django17]
31 basepython = python2.7 12 basepython = python2.7
32 deps = Django>=1.7,<1.8 13 deps = Django>=1.7,<1.8
Please register or login to post a comment