diff --git a/.zuul.yaml b/.zuul.yaml index 737eaf3..f6c1ef6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,8 +4,14 @@ - openstack-tox-lower-constraints: required-projects: - openstack/horizon + - horizon-openstack-tox-py35dj20: + required-projects: + openstack/horizon gate: jobs: - openstack-tox-lower-constraints: required-projects: - openstack/horizon + - horizon-openstack-tox-py35dj20: + required-projects: + openstack/horizon diff --git a/blazar_dashboard/content/hosts/tabs.py b/blazar_dashboard/content/hosts/tabs.py index 7babd96..d46d640 100644 --- a/blazar_dashboard/content/hosts/tabs.py +++ b/blazar_dashboard/content/hosts/tabs.py @@ -13,7 +13,7 @@ # 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.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs diff --git a/blazar_dashboard/content/hosts/tests.py b/blazar_dashboard/content/hosts/tests.py index 009ea35..980d8c2 100644 --- a/blazar_dashboard/content/hosts/tests.py +++ b/blazar_dashboard/content/hosts/tests.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.core.urlresolvers import reverse +from django.urls import reverse import mock from openstack_dashboard import api diff --git a/blazar_dashboard/content/hosts/views.py b/blazar_dashboard/content/hosts/views.py index 1ab8514..c1b2b8c 100644 --- a/blazar_dashboard/content/hosts/views.py +++ b/blazar_dashboard/content/hosts/views.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms diff --git a/blazar_dashboard/content/leases/tabs.py b/blazar_dashboard/content/leases/tabs.py index 9c6e728..9e98e2e 100644 --- a/blazar_dashboard/content/leases/tabs.py +++ b/blazar_dashboard/content/leases/tabs.py @@ -13,7 +13,7 @@ # 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.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs diff --git a/blazar_dashboard/content/leases/tests.py b/blazar_dashboard/content/leases/tests.py index 7fd459c..2b97585 100644 --- a/blazar_dashboard/content/leases/tests.py +++ b/blazar_dashboard/content/leases/tests.py @@ -12,7 +12,7 @@ from datetime import datetime -from django.core.urlresolvers import reverse +from django.urls import reverse import mock import pytz diff --git a/blazar_dashboard/content/leases/views.py b/blazar_dashboard/content/leases/views.py index 5dbc9eb..d9e86af 100644 --- a/blazar_dashboard/content/leases/views.py +++ b/blazar_dashboard/content/leases/views.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.core.urlresolvers import reverse -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms diff --git a/tox.ini b/tox.ini index d12e227..aef13f9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35,py27,py27dj18,pep8 +envlist = py35,py27,pep8 minversion = 2.0 skipsdist = True @@ -30,29 +30,11 @@ commands = coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml' coverage html --omit '.tox/cover/*' -d 'cover/htmlcov' -[testenv:py27dj18] -basepython = python2.7 +[testenv:py35dj20] +basepython = python3.5 commands = - pip install django>=1.8,<1.9 - python manage.py test {posargs} --settings=blazar_dashboard.test.settings - -[testenv:py27dj19] -basepython = python2.7 -commands = - pip install django>=1.9,<1.10 - python manage.py test {posargs} --settings=blazar_dashboard.test.settings - -[testenv:py27dj110] -basepython = python2.7 -commands = - pip install django>=1.10,<1.11 - python manage.py test {posargs} --settings=blazar_dashboard.test.settings - -[testenv:py27dj111] -basepython = python2.7 -commands = - pip install django>=1.11,<2.0 - python manage.py test {posargs} --settings=blazar_dashboard.test.settings + pip install django>=2.0,<2.1 + python manage.py test {posargs} --settings=blazar_dashboard.test.settings [testenv:eslint] whitelist_externals = npm