diff --git a/disaster_recovery/actions/tables.py b/disaster_recovery/actions/tables.py index 14f918d..c507813 100644 --- a/disaster_recovery/actions/tables.py +++ b/disaster_recovery/actions/tables.py @@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from django.core.urlresolvers import reverse +from django.urls import reverse import disaster_recovery.api.api as freezer_api diff --git a/disaster_recovery/actions/views.py b/disaster_recovery/actions/views.py index 2c57f76..4564425 100644 --- a/disaster_recovery/actions/views.py +++ b/disaster_recovery/actions/views.py @@ -12,7 +12,7 @@ import pprint -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from django.views import generic diff --git a/disaster_recovery/backups/tables.py b/disaster_recovery/backups/tables.py index 7d702c5..5aaae31 100644 --- a/disaster_recovery/backups/tables.py +++ b/disaster_recovery/backups/tables.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import safestring from django.utils.translation import ungettext_lazy from django.utils.translation import ugettext_lazy as _ diff --git a/disaster_recovery/clients/tables.py b/disaster_recovery/clients/tables.py index faccd13..7586134 100644 --- a/disaster_recovery/clients/tables.py +++ b/disaster_recovery/clients/tables.py @@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from django.core.urlresolvers import reverse +from django.urls import reverse import disaster_recovery.api.api as freezer_api from disaster_recovery.utils import shield diff --git a/disaster_recovery/jobs/tables.py b/disaster_recovery/jobs/tables.py index 1cb09f4..e24ed55 100644 --- a/disaster_recovery/jobs/tables.py +++ b/disaster_recovery/jobs/tables.py @@ -18,7 +18,7 @@ from django.utils.translation import ungettext_lazy from horizon import tables from horizon import messages -from django.core.urlresolvers import reverse +from django.urls import reverse import disaster_recovery.api.api as freezer_api from disaster_recovery.utils import shield diff --git a/disaster_recovery/sessions/tables.py b/disaster_recovery/sessions/tables.py index 7efc105..bf168a5 100644 --- a/disaster_recovery/sessions/tables.py +++ b/disaster_recovery/sessions/tables.py @@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy -from django.core.urlresolvers import reverse +from django.urls import reverse from horizon import tables diff --git a/disaster_recovery/sessions/workflows/attach.py b/disaster_recovery/sessions/workflows/attach.py index f22186c..be805a0 100644 --- a/disaster_recovery/sessions/workflows/attach.py +++ b/disaster_recovery/sessions/workflows/attach.py @@ -13,7 +13,7 @@ # limitations under the License. from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import reverse +from django.urls import reverse from horizon import exceptions from horizon import forms diff --git a/disaster_recovery/sessions/workflows/create.py b/disaster_recovery/sessions/workflows/create.py index ddb1608..ac39bc6 100644 --- a/disaster_recovery/sessions/workflows/create.py +++ b/disaster_recovery/sessions/workflows/create.py @@ -14,7 +14,7 @@ import datetime -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ diff --git a/disaster_recovery/utils.py b/disaster_recovery/utils.py index 862d3f6..2d7e717 100644 --- a/disaster_recovery/utils.py +++ b/disaster_recovery/utils.py @@ -17,7 +17,7 @@ import re from functools import wraps -from django.core.urlresolvers import reverse +from django.urls import reverse from django.template.defaultfilters import date as django_date from django.utils.translation import ugettext_lazy as _ diff --git a/tox.ini b/tox.ini index 3acd885..34ab123 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py27dj18,pep8,py35,py35dj18,pylint +envlist = py27,pep8,py35,pylint minversion = 1.6 skipsdist = True @@ -25,17 +25,6 @@ commands = {posargs} [testenv:cover] commands = python setup.py test --coverage --testr-args='{posargs}' -[testenv:py27dj18] -basepython = python2.7 -commands = - python manage.py test {posargs} - - -[testenv:py35dj18] -basepython = python3.5 -commands = - python manage.py test {posargs} - [testenv:docs] setenv = DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings commands = python setup.py build_sphinx