diff --git a/example/example/urls.py b/example/example/urls.py index dc0789d..492de56 100644 --- a/example/example/urls.py +++ b/example/example/urls.py @@ -1,12 +1,19 @@ -from django.conf.urls import patterns, include, url - from django.contrib import admin -admin.autodiscover() -urlpatterns = patterns('', - # Examples: - # url(r'^$', 'example.views.home', name='home'), - # url(r'^blog/', include('blog.urls')), +try: + from django.conf.urls import patterns, include, url + + admin.autodiscover() + + urlpatterns = patterns('', + # Examples: + # url(r'^$', 'example.views.home', name='home'), + # url(r'^blog/', include('blog.urls')), - url(r'^admin/', include(admin.site.urls)), -) + url(r'^admin/', include(admin.site.urls)), + ) +except ImportError: + from django.urls import path + urlpatterns = [ + path('admin/', admin.site.urls) + ] diff --git a/fsm_admin/__init__.py b/fsm_admin/__init__.py index 6fd5b02..2cb473f 100644 --- a/fsm_admin/__init__.py +++ b/fsm_admin/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -__version__ = '1.2.5' +__version__ = '1.2.6' __author__ = 'G Adventures' diff --git a/fsm_admin/mixins.py b/fsm_admin/mixins.py index 15590f7..9fb8426 100644 --- a/fsm_admin/mixins.py +++ b/fsm_admin/mixins.py @@ -4,8 +4,14 @@ from django.conf import settings from django.contrib import messages -from django.utils.translation import ugettext as _ -from django.utils.encoding import force_text +try: + from django.utils.translation import ugettext as _ + from django.utils.encoding import force_text +except ImportError: + from django.utils.translation import gettext as _ + from django.utils.encoding import force_str as force_text + + from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.http import HttpResponseRedirect diff --git a/requirements.txt b/requirements.txt index 96f3823..f28b258 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Django>=1.6 -django-fsm==2.0.1 +django-fsm>=2 diff --git a/setup.py b/setup.py index 5df3de7..7f0a46f 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ import fsm_admin readme = open("README.rst").read() +requirements_txt = open('requirements.txt').read() setup( name="django-fsm-admin", @@ -18,11 +19,7 @@ author_email="software@gadventures.com", url="https://github.com/gadventures/django-fsm-admin", packages=find_packages(), - include_package_data=True, - install_requires=[ - "Django>=1.6", - "django-fsm>=2.1.0", - ], + install_requires=requirements_txt.splitlines(False), keywords="django fsm admin", license="MIT", platforms=["any"],