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 38a2cc39574fb4e4514b826dddf463cdd2572fbd..26c56c1ef457a11995fac71e35f297d49dbb6588 100644 (file)
--- 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<flowcell>\w+)/$', 'eland_config.views.config'),
-    url(r'^$', 'eland_config.views.config'),
-    #url(r'^$', 'htsworkflow.frontend.eland_config.views.index')
-
-)
+urlpatterns = [
+    url(r'^(?P<flowcell>\w+)/$', config),
+    url(r'^$', config),
+]

diff --git a/experiments/urls.py b/experiments/urls.py
index 0b1722ec1a43df24d2b1626885867b161ab508a6..04f957ad89378f9342c0e502fc239faa14c60a2d 100644 (file)
--- 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<run_folder>.+)/$', 'gaworkflow.frontend.experiments.views.detail'),
-    (r'^config/(?P<fc_id>.+)/json$', 'experiments.experiments.flowcell_json'),
-    (r'^lanes_for/(?P<username>.+)/json$', 'experiments.experiments.lanes_for_json'),
-    (r'^file/(?P<key>.+)/?$', 'experiments.views.read_result_file'),
-    (r'^started/(?P<pk>.+)/$', 'experiments.views.startedEmail'),
-    (r'^finished/(?P<pk>.+)/$', '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<run_folder>.+)/$', 'gaworkflow.frontend.experiments.views.detail'),
+    url(r'^config/(?P<fc_id>.+)/json$', flowcell_json),
+    url(r'^lanes_for/(?P<username>.+)/json$', lanes_for_json),
+    url(r'^file/(?P<key>.+)/?$', read_result_file),
+    url(r'^started/(?P<pk>.+)/$', startedEmail),
+    url(r'^finished/(?P<pk>.+)/$', finishedEmail),
+]

diff --git a/htsworkflow/urls.py b/htsworkflow/urls.py
index dc47cf45e76c6b163622d1dbd6982bc264809302..02af9b3c606dc21a22caa8137be3c3a7064e0f5a 100644 (file)
--- 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<lane_pk>\w+)',
-        'experiments.views.flowcell_lane_detail'),
-    url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$',
-        'experiments.views.flowcell_detail'),
+    url(r'^lane/(?P<lane_pk>\w+)', flowcell_lane_detail),
+    url(r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\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<username>[-_ \w]+)', 'experiments.views.lanes_for'),
+    url(r'^lanes_for/$', lanes_for),
+    url(r'^lanes_for/(?P<username>[-_ \w]+)', lanes_for),
     ### library id to admin url
-    url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$',
-        'samples.views.library_id_to_admin_url'),
+    url(r'^library_id_to_admin_url/(?P<lib_id>\w+)/$', library_id_to_admin_url),
     ### sample / library information
     url(r'^samples/', include('samples.urls')),
-    url(r'^sequencer/(?P<sequencer_id>\w+)',
-        'experiments.views.sequencer'),
+    url(r'^sequencer/(?P<sequencer_id>\w+)', sequencer),
 
     url(r'^admin/', include(admin.site.urls)),
-)
+]

diff --git a/inventory/urls.py b/inventory/urls.py
index 98ece191231dd9b48d48ae0ea770c9aa34b7e614..4dcf1bd2bd52ea8f69d346affe1c8d8f42c78ebc 100644 (file)
--- 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<flowcell>.+)/(?P<serial>.+)/$', 'inventory.views.link_flowcell_and_device'),
+    url(r'^lts/link/(?P<flowcell>.+)/(?P<serial>.+)/$', link_flowcell_and_device),
 
     # INDEX
-    (r'^it/(?P<name>.+)/$', 'inventory.views.itemtype_index'),
-    (r'^(?P<uuid>[a-fA-F0-9]{32})/$', 'inventory.views.item_summary_by_uuid'),
-    (r'^(?P<uuid>[a-fA-F0-9]{32})/print/$', 'inventory.views.item_print'),
-    (r'^(?P<barcode_id>.+)/$', 'inventory.views.item_summary_by_barcode'),
-    (r'^all_index/$', 'inventory.views.all_index'),
-    (r'^$', 'inventory.views.index')
-    )
+    url(r'^it/(?P<name>.+)/$', itemtype_index),
+    url(r'^(?P<uuid>[a-fA-F0-9]{32})/$', item_summary_by_uuid),
+    url(r'^(?P<uuid>[a-fA-F0-9]{32})/print/$', item_print),
+    url(r'^(?P<barcode_id>.+)/$', item_summary_by_barcode),
+    url(r'^all_index/$', all_index),
+    url(r'^$', index)
+]

diff --git a/samples/urls.py b/samples/urls.py
index 1bda463ed3c6a965d61ee287e464e13e984a3277..bc83238a72a5b8719b873f1316eb2ca71fcdde53 100644 (file)
--- 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<lib_id>\w+)/$',
-        'library_to_flowcells'),
-
-    url(r"^library/(?P<library_id>\w+)/json$", 'library_json'),
-    url(r"^species/(?P<species_id>\w+)/json$", 'species_json'),
-    url(r"^species/(?P<species_id>\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<lib_id>\w+)/$', library_to_flowcells),
+    url(r"^library/(?P<library_id>\w+)/json$", library_json),
+    url(r"^species/(?P<species_id>\w+)/json$", species_json),
+    url(r"^species/(?P<species_id>\w+)$", species),
+    url(r"^antibody/$", antibodies),
+]