From: Diane Trout Date: Fri, 8 Apr 2016 00:01:46 +0000 (-0700) Subject: Django 1.9 deprecated string based url names and django.conf.url.patterns X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=927b97604bdd30b0022e49f6e1d11f068f50d8df Django 1.9 deprecated string based url names and django.conf.url.patterns I think those changes should be backwards, and they usually shorten the url() lines so seemed reasonable to apply. --- diff --git a/eland_config/urls.py b/eland_config/urls.py index 38a2cc3..26c56c1 100644 --- a/eland_config/urls.py +++ b/eland_config/urls.py @@ -1,12 +1,10 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url +from django.conf.urls import url -urlpatterns = patterns('', - ## Example: +from .views import config - url(r'^(?P\w+)/$', 'eland_config.views.config'), - url(r'^$', 'eland_config.views.config'), - #url(r'^$', 'htsworkflow.frontend.eland_config.views.index') - -) +urlpatterns = [ + url(r'^(?P\w+)/$', config), + url(r'^$', config), +] diff --git a/experiments/urls.py b/experiments/urls.py index 0b1722e..04f957a 100644 --- a/experiments/urls.py +++ b/experiments/urls.py @@ -1,14 +1,21 @@ from __future__ import unicode_literals -from django.conf.urls import patterns +from django.conf.urls import url -urlpatterns = patterns('', - (r'^$', 'experiments.views.index'), - #(r'^liblist$', 'htsworkflow.frontend.experiments.views.test_Libs'), - #(r'^(?P.+)/$', 'gaworkflow.frontend.experiments.views.detail'), - (r'^config/(?P.+)/json$', 'experiments.experiments.flowcell_json'), - (r'^lanes_for/(?P.+)/json$', 'experiments.experiments.lanes_for_json'), - (r'^file/(?P.+)/?$', 'experiments.views.read_result_file'), - (r'^started/(?P.+)/$', 'experiments.views.startedEmail'), - (r'^finished/(?P.+)/$', 'experiments.views.finishedEmail'), -) +from .experiments import flowcell_json +from .experiments import lanes_for_json +from .views import index +from .views import read_result_file +from .views import startedEmail +from .views import finishedEmail + +urlpatterns = [ + url(r'^$', index), + #url(r'^liblist$', 'htsworkflow.frontend.experiments.views.test_Libs'), + #url(r'^(?P.+)/$', 'gaworkflow.frontend.experiments.views.detail'), + url(r'^config/(?P.+)/json$', flowcell_json), + url(r'^lanes_for/(?P.+)/json$', lanes_for_json), + url(r'^file/(?P.+)/?$', read_result_file), + url(r'^started/(?P.+)/$', startedEmail), + url(r'^finished/(?P.+)/$', finishedEmail), +] diff --git a/htsworkflow/urls.py b/htsworkflow/urls.py index dc47cf4..02af9b3 100644 --- a/htsworkflow/urls.py +++ b/htsworkflow/urls.py @@ -1,30 +1,33 @@ -from django.conf.urls import include, patterns, url +from django.conf.urls import include, url from django.contrib import admin admin.autodiscover() -from django.conf import settings -urlpatterns = patterns('', +from experiments.views import ( + flowcell_lane_detail, + flowcell_detail, + lanes_for, + sequencer, +) +from samples.views import library_id_to_admin_url + +urlpatterns = [ url('^accounts/', include('django.contrib.auth.urls')), # Base: url(r'^eland_config/', include('eland_config.urls')), # Experiments: url(r'^experiments/', include('experiments.urls')), - url(r'^lane/(?P\w+)', - 'experiments.views.flowcell_lane_detail'), - url(r'^flowcell/(?P\w+)/((?P\w+)/)?$', - 'experiments.views.flowcell_detail'), + url(r'^lane/(?P\w+)', flowcell_lane_detail), + url(r'^flowcell/(?P\w+)/((?P\w+)/)?$', flowcell_detail), url(r'^inventory/', include('inventory.urls')), url(r'^library/', include('samples.urls')), - url(r'^lanes_for/$', 'experiments.views.lanes_for'), - url(r'^lanes_for/(?P[-_ \w]+)', 'experiments.views.lanes_for'), + url(r'^lanes_for/$', lanes_for), + url(r'^lanes_for/(?P[-_ \w]+)', lanes_for), ### library id to admin url - url(r'^library_id_to_admin_url/(?P\w+)/$', - 'samples.views.library_id_to_admin_url'), + url(r'^library_id_to_admin_url/(?P\w+)/$', library_id_to_admin_url), ### sample / library information url(r'^samples/', include('samples.urls')), - url(r'^sequencer/(?P\w+)', - 'experiments.views.sequencer'), + url(r'^sequencer/(?P\w+)', sequencer), url(r'^admin/', include(admin.site.urls)), -) +] diff --git a/inventory/urls.py b/inventory/urls.py index 98ece19..4dcf1bd 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -1,18 +1,29 @@ from __future__ import unicode_literals -from django.conf.urls import patterns +from django.conf.urls import url -urlpatterns = patterns('', +from .views import ( + data_items, + link_flowcell_and_device, + itemtype_index, + item_summary_by_uuid, + item_print, + item_summary_by_barcode, + all_index, + index + +) +urlpatterns = [ # DATA - (r'^data/items/$', 'inventory.views.data_items'), + url(r'^data/items/$', data_items), # REMOTE LINKING - (r'^lts/link/(?P.+)/(?P.+)/$', 'inventory.views.link_flowcell_and_device'), + url(r'^lts/link/(?P.+)/(?P.+)/$', link_flowcell_and_device), # INDEX - (r'^it/(?P.+)/$', 'inventory.views.itemtype_index'), - (r'^(?P[a-fA-F0-9]{32})/$', 'inventory.views.item_summary_by_uuid'), - (r'^(?P[a-fA-F0-9]{32})/print/$', 'inventory.views.item_print'), - (r'^(?P.+)/$', 'inventory.views.item_summary_by_barcode'), - (r'^all_index/$', 'inventory.views.all_index'), - (r'^$', 'inventory.views.index') - ) + url(r'^it/(?P.+)/$', itemtype_index), + url(r'^(?P[a-fA-F0-9]{32})/$', item_summary_by_uuid), + url(r'^(?P[a-fA-F0-9]{32})/print/$', item_print), + url(r'^(?P.+)/$', item_summary_by_barcode), + url(r'^all_index/$', all_index), + url(r'^$', index) +] diff --git a/samples/urls.py b/samples/urls.py index 1bda463..bc83238 100644 --- a/samples/urls.py +++ b/samples/urls.py @@ -1,16 +1,24 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url +from django.conf.urls import url -urlpatterns = patterns('samples.views', - # View livrary list - url(r'^$', 'library'), - url(r'^not_run/$', 'library_not_run'), - url(r'^(?P\w+)/$', - 'library_to_flowcells'), - - url(r"^library/(?P\w+)/json$", 'library_json'), - url(r"^species/(?P\w+)/json$", 'species_json'), - url(r"^species/(?P\w+)$", 'species'), - url(r"^antibody/$", 'antibodies'), +from samples.views import ( + library, + library_not_run, + library_to_flowcells, + library_json, + species_json, + species, + antibodies, ) + +urlpatterns = [ + # View livrary list + url(r'^$', library), + url(r'^not_run/$', library_not_run), + url(r'^(?P\w+)/$', library_to_flowcells), + url(r"^library/(?P\w+)/json$", library_json), + url(r"^species/(?P\w+)/json$", species_json), + url(r"^species/(?P\w+)$", species), + url(r"^antibody/$", antibodies), +]