Bump version

.gitignore

@@ -1,5 +1,5 @@
 *.pyc
-dist
-django_fsm.egg-info
-reports
-.tox
+dist/
+build/
+django_fsm.egg-info/
+.tox/

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+django-fsm 2.6.0 2017-06-08
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Fix django 1.11 compatibility
+- Fix TypeError in `graph_transitions` command when using django's lazy translations
+
+
 django-fsm 2.5.0 2017-03-04
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

README.rst

@@ -411,15 +411,11 @@ your ``INSTALLED_APPS``:
 Changelog
 ---------
 
-django-fsm 2.5.0 2017-03-04
+django-fsm 2.6.0 2017-06-08
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- graph_transition command fix for django 1.10
-- graph_transition command supports GET_STATE targets
-- signal data extended with method args/kwargs and field
-- sets allowed to be passed to the transition decorator
-
-
+- Fix django 1.11 compatibility
+- Fix TypeError in `graph_transitions` command when using django's lazy translations
 
 .. |Build Status| image:: https://travis-ci.org/kmmbvnr/django-fsm.svg?branch=master
    :target: https://travis-ci.org/kmmbvnr/django-fsm

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='django-fsm',
-    version='2.5.0',
+    version='2.6.0',
     description='Django friendly finite state machine support.',
     author='Mikhail Podgurskiy',
     author_email='kmmbvnr@gmail.com',
@@ -28,12 +28,14 @@
         "Framework :: Django :: 1.8",
         "Framework :: Django :: 1.9",
         "Framework :: Django :: 1.10",
+        "Framework :: Django :: 1.11",
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Framework :: Django',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ]

tests/settings.py

@@ -1,5 +1,5 @@
 PROJECT_APPS = ('django_fsm', 'testapp',)
-INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'guardian', 'django_jenkins') + PROJECT_APPS
+INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'guardian', ) + PROJECT_APPS
 DATABASE_ENGINE = 'sqlite3'
 SECRET_KEY = 'nokey'
 MIDDLEWARE_CLASSES = ()
@@ -9,9 +9,4 @@
         }
 }
 
-JENKINS_TASKS = (
-    'django_jenkins.tasks.run_pep8',
-    'django_jenkins.tasks.run_pyflakes'
-)
-
-ANONYMOUS_USER_ID=0
+ANONYMOUS_USER_ID = 0

tox.ini

@@ -3,35 +3,31 @@ envlist =
     py26-dj{16}
     py27-dj{16,18,19,110,111}
     py33-dj{16,18}
-    py{34,35}-dj{18,19,110,111}
+    py{34,35,36}-dj{18,19,110,111}
 skipsdist = True
 
 [testenv]
 deps =
     py26: ipython==2.1.0
-    {py27,py32,py33,py34,py35}: ipython==4.1.1
+    {py27,py32,py33}: ipython==5.4.1
+    {py34,py35,py36}: ipython==6.1.0
     dj16: Django==1.6.11
-    dj16: django-jenkins==0.17.0
     dj16: coverage<=3.999
     dj16: django-guardian==1.3.2
-    dj18: Django==1.8.13
-    dj18: django-jenkins==0.18.1
+    dj18: Django==1.8.18
     dj18: coverage==4.1
     dj18: django-guardian==1.4.4
-    dj19: Django==1.9.7
-    dj19: django-jenkins==0.19.0
+    dj19: Django==1.9.13
     dj19: coverage==4.1
     dj19: django-guardian==1.4.4
-    dj110: Django==1.10.5
-    dj110: django-jenkins==0.19.0
+    dj110: Django==1.10.7
     dj110: coverage==4.1
     dj110: django-guardian==1.4.4
-    dj111: Django==1.11b1
-    dj111: django-jenkins==0.110.0
+    dj111: Django==1.11.2
     dj111: coverage==4.3.4
-    dj111: django-guardian==1.4.6
-    graphviz==0.4.10
+    dj111: django-guardian==1.4.8
+    graphviz==0.7.1
     pep8==1.7.0
-    pyflakes==1.0.0
+    pyflakes==1.5.0
     ipdb==0.8.1
-commands = python tests/manage.py {posargs:jenkins --pep8-max-line-length=150 --output-dir=reports/{envname}}
+commands = {posargs:python ./tests/manage.py test}