diff --git a/.zuul.yaml b/.zuul.yaml index 471167fe..adcc7f28 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,10 +18,16 @@ - openstack/neutron - openstack/networking-bagpipe - openstack/horizon + - horizon-openstack-tox-py35dj20: + required-projects: + - openstack/horizon gate: jobs: - - openstack-tox-lower-constraints: + - openstack-tox-lower-constraints: required-projects: - openstack/neutron - openstack/networking-bagpipe - openstack/horizon + - horizon-openstack-tox-py35dj20: + required-projects: + - openstack/horizon diff --git a/bgpvpn_dashboard/dashboards/admin/bgpvpn/forms.py b/bgpvpn_dashboard/dashboards/admin/bgpvpn/forms.py index 673109e9..560b45b4 100755 --- a/bgpvpn_dashboard/dashboards/admin/bgpvpn/forms.py +++ b/bgpvpn_dashboard/dashboards/admin/bgpvpn/forms.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from django.core.urlresolvers import reverse_lazy from django.core.validators import RegexValidator +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from horizon import forms diff --git a/bgpvpn_dashboard/dashboards/admin/bgpvpn/tables.py b/bgpvpn_dashboard/dashboards/admin/bgpvpn/tables.py index 96de32e2..95578d27 100755 --- a/bgpvpn_dashboard/dashboards/admin/bgpvpn/tables.py +++ b/bgpvpn_dashboard/dashboards/admin/bgpvpn/tables.py @@ -15,7 +15,7 @@ import logging -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import html from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy diff --git a/bgpvpn_dashboard/dashboards/admin/bgpvpn/views.py b/bgpvpn_dashboard/dashboards/admin/bgpvpn/views.py index 1ef4e516..4f050d4a 100755 --- a/bgpvpn_dashboard/dashboards/admin/bgpvpn/views.py +++ b/bgpvpn_dashboard/dashboards/admin/bgpvpn/views.py @@ -12,7 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # 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 diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py index 750b20d7..aee6e14c 100755 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py @@ -16,7 +16,7 @@ import collections import logging -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 diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tables.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tables.py index ca261696..fa766a66 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tables.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tables.py @@ -14,8 +14,8 @@ # under the License. import logging -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 import safestring from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tabs.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tabs.py index 46cb3d57..3656f4ce 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/tabs.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/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 diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/views.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/views.py index 2f0cad65..c318271f 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/views.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/network_associations/views.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/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tables.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tables.py index a13f454a..2f0504d3 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tables.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tables.py @@ -15,8 +15,8 @@ import logging -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 import safestring from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tabs.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tabs.py index d617797f..8c774371 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/tabs.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/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 _ diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/views.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/views.py index 04f9835b..6eadaae3 100644 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/views.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/router_associations/views.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 forms diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/tables.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/tables.py index 09a23f6d..0a30bf7b 100755 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/tables.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/tables.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 import html from django.utils.http import urlencode from django.utils import safestring diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/urls.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/urls.py index 6d9efed4..f923c34d 100755 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/urls.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/urls.py @@ -55,8 +55,8 @@ urlpatterns = [ r'update$', router_associations_views.UpdateRouterAssociationsView.as_view(), name='update-router-association'), - url(r'^network_assos/', include(network_associations_urls, - namespace='network_assos')), - url(r'^router_assos/', include(router_associations_urls, - namespace='router_assos')), + url(r'^network_assos/', + include((network_associations_urls, 'network_assos'))), + url(r'^router_assos/', + include((router_associations_urls, 'router_assos'))), ] diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/views.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/views.py index cd898a70..c121bba7 100755 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/views.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/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/bgpvpn_dashboard/test/project/test_views.py b/bgpvpn_dashboard/test/project/test_views.py index 9ff52474..0afa98a1 100644 --- a/bgpvpn_dashboard/test/project/test_views.py +++ b/bgpvpn_dashboard/test/project/test_views.py @@ -14,8 +14,8 @@ import mock -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 bgpvpn_dashboard.api import bgpvpn as bgpvpn_api from bgpvpn_dashboard.dashboards.project.bgpvpn import forms as bgpvpn_form diff --git a/tox.ini b/tox.ini index 7bb95742..d126c9d5 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/re -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = {toxinidir}/tools/ostestr_compat_shim.sh {posargs} - python {toxinidir}/tools/django-manage.py test bgpvpn_dashboard.test.api_tests.bgpvpn_tests + python {toxinidir}/tools/django-manage.py test bgpvpn_dashboard [testenv:releasenotes] deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} @@ -115,3 +115,9 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt + +[testenv:py35dj20] +basepython = python3.5 +commands = + pip install django>=2.0,<2.1 + python {toxinidir}/tools/django-manage.py test bgpvpn_dashboard

AltStyle によって変換されたページ (->オリジナル) /