diff --git a/cloudkittydashboard/dashboards/admin/hashmap/urls.py b/cloudkittydashboard/dashboards/admin/hashmap/urls.py index 2d46872..54fffc0 100644 --- a/cloudkittydashboard/dashboards/admin/hashmap/urls.py +++ b/cloudkittydashboard/dashboards/admin/hashmap/urls.py @@ -12,13 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns from django.conf.urls import url from cloudkittydashboard.dashboards.admin.hashmap import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^service/(?P[^/]+)/?$', views.ServiceView.as_view(), @@ -65,4 +63,4 @@ urlpatterns = patterns( url(r'^edit_threshold/field/(?P[^/]+)/?$', views.FieldThresholdEditView.as_view(), name='field_threshold_edit'), -) +] diff --git a/cloudkittydashboard/dashboards/admin/modules/urls.py b/cloudkittydashboard/dashboards/admin/modules/urls.py index 01eca35..90f0230 100644 --- a/cloudkittydashboard/dashboards/admin/modules/urls.py +++ b/cloudkittydashboard/dashboards/admin/modules/urls.py @@ -12,17 +12,15 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns from django.conf.urls import url from cloudkittydashboard.dashboards.admin.modules import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^(?P[^/]+)/?$', views.ModuleDetailsView.as_view(), name="module_details"), url(r'^edit_priority/(?P[^/]+)/?$', views.PriorityModuleEditView.as_view(), name="edit_priority"), -) +] diff --git a/cloudkittydashboard/dashboards/admin/pyscripts/urls.py b/cloudkittydashboard/dashboards/admin/pyscripts/urls.py index cbfa9d2..47292bb 100644 --- a/cloudkittydashboard/dashboards/admin/pyscripts/urls.py +++ b/cloudkittydashboard/dashboards/admin/pyscripts/urls.py @@ -12,17 +12,15 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns from django.conf.urls import url from cloudkittydashboard.dashboards.admin.pyscripts import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^create/?$', views.ScriptCreateView.as_view(), name="script_create"), url(r'^update/(?P[^/]+)/?$', views.ScriptUpdateView.as_view(), name="script_update"), url(r'^(?P[^/]+)/?$', views.ScriptDetailsView.as_view(), name="script_details"), - ) + ] diff --git a/cloudkittydashboard/dashboards/project/rating/urls.py b/cloudkittydashboard/dashboards/project/rating/urls.py index c80e663..66da38e 100644 --- a/cloudkittydashboard/dashboards/project/rating/urls.py +++ b/cloudkittydashboard/dashboards/project/rating/urls.py @@ -12,13 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns from django.conf.urls import url from cloudkittydashboard.dashboards.project.rating import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^quote$', views.quote, name='quote') -) +] diff --git a/cloudkittydashboard/dashboards/project/reporting/urls.py b/cloudkittydashboard/dashboards/project/reporting/urls.py index 577d8d8..d574124 100644 --- a/cloudkittydashboard/dashboards/project/reporting/urls.py +++ b/cloudkittydashboard/dashboards/project/reporting/urls.py @@ -1,9 +1,7 @@ -from django.conf.urls import patterns from django.conf.urls import url from cloudkittydashboard.dashboards.project.reporting import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), -) +] diff --git a/cloudkittydashboard/overrides.py b/cloudkittydashboard/overrides.py index 1beedcb..7a9c747 100644 --- a/cloudkittydashboard/overrides.py +++ b/cloudkittydashboard/overrides.py @@ -14,7 +14,6 @@ # under the License. # -from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from django.utils.translation import ugettext_lazy as _ from openstack_dashboard.dashboards.project.instances.workflows \ diff --git a/requirements.txt b/requirements.txt index a9b7508..148c0c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 + +pbr!= 2.1.0,>=2.0.0 Babel>=1.3 python-cloudkittyclient>=0.5.0 +