Skip to content

Commit d917737

Browse files
committed
migrate to django 4
1 parent 69f7b47 commit d917737

File tree

3 files changed

+66
-29
lines changed

3 files changed

+66
-29
lines changed

chatbot_app/settings.py

-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@
138138

139139
USE_I18N = True
140140

141-
USE_L10N = True
142-
143141
USE_TZ = True
144142

145143
try:

chatbot_app/urls.py

+65-26
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,74 @@
1-
from django.conf.urls import url
1+
from django.urls import re_path
22

3-
from chat.views.correspondance_api import get_rml_mapping, get_class, result_confirmed_correspondances
4-
from chat.views.correspondance_api import result_awaiting_correspondances, result_denied_correspondances
5-
from chat.views.correspondance_api import get_field_class_correspondance, get_field_property_correspondance
6-
from chat.views.correspondance_api import saturate_mapping, catalog_search, catalog_dataset_lookup, dataset_records
3+
from chat.views.correspondance_api import (
4+
get_rml_mapping,
5+
get_class,
6+
result_confirmed_correspondances,
7+
)
8+
from chat.views.correspondance_api import (
9+
result_awaiting_correspondances,
10+
result_denied_correspondances,
11+
)
12+
from chat.views.correspondance_api import (
13+
get_field_class_correspondance,
14+
get_field_property_correspondance,
15+
)
16+
from chat.views.correspondance_api import (
17+
saturate_mapping,
18+
catalog_search,
19+
catalog_dataset_lookup,
20+
dataset_records,
21+
)
722
from chat.views.root import api_root, index
823

924
url_api = [
10-
url(r'^api/catalog/datasets/(?P<dataset_id>[\w_@-]+)/?$', catalog_dataset_lookup, name='catalog_dataset_lookup'),
11-
url(r'^api/records/datasets/(?P<dataset_id>[\w_@-]+)/?$', dataset_records, name='dataset_records'),
12-
url(r'^api/ner', get_class, name='get_class'),
13-
url(r'^api/saturate', saturate_mapping, name='saturate_mapping'),
14-
url(r'^api/catalog', catalog_search, name='catalog'),
15-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/confirmed', result_confirmed_correspondances,
16-
name='post_result_confirmed_correspondances'),
17-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/awaiting', result_awaiting_correspondances,
18-
name='post_result_awaiting_correspondances'),
19-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/denied', result_denied_correspondances,
20-
name='post_result_denied_correspondances'),
21-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/mapping', get_rml_mapping,
22-
name='post_then_get_rml_mapping'),
23-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/field/class', get_field_class_correspondance,
24-
name='get_field_class_correspondance'),
25-
url(r'^api/(?P<dataset_id>[\w_@-]+)/correspondances/field/property', get_field_property_correspondance,
26-
name='get_field_property_correspondance'),
27-
url(r'^api', api_root, name='api_root')
25+
re_path(
26+
r"^api/catalog/datasets/(?P<dataset_id>[\w_@-]+)/?$",
27+
catalog_dataset_lookup,
28+
name="catalog_dataset_lookup",
29+
),
30+
re_path(
31+
r"^api/records/datasets/(?P<dataset_id>[\w_@-]+)/?$",
32+
dataset_records,
33+
name="dataset_records",
34+
),
35+
re_path(r"^api/ner", get_class, name="get_class"),
36+
re_path(r"^api/saturate", saturate_mapping, name="saturate_mapping"),
37+
re_path(r"^api/catalog", catalog_search, name="catalog"),
38+
re_path(
39+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/confirmed",
40+
result_confirmed_correspondances,
41+
name="post_result_confirmed_correspondances",
42+
),
43+
re_path(
44+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/awaiting",
45+
result_awaiting_correspondances,
46+
name="post_result_awaiting_correspondances",
47+
),
48+
re_path(
49+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/denied",
50+
result_denied_correspondances,
51+
name="post_result_denied_correspondances",
52+
),
53+
re_path(
54+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/mapping",
55+
get_rml_mapping,
56+
name="post_then_get_rml_mapping",
57+
),
58+
re_path(
59+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/field/class",
60+
get_field_class_correspondance,
61+
name="get_field_class_correspondance",
62+
),
63+
re_path(
64+
r"^api/(?P<dataset_id>[\w_@-]+)/correspondances/field/property",
65+
get_field_property_correspondance,
66+
name="get_field_property_correspondance",
67+
),
68+
re_path(r"^api", api_root, name="api_root"),
2869
]
2970

30-
url_root = [
31-
url(r'^$', index, name='index')
32-
]
71+
url_root = [re_path(r"^$", index, name="index")]
3372

3473
urlpatterns = url_api
3574
urlpatterns += url_root

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ beautifulsoup4>=4.6
44
html5lib>=1.0.1
55
rdflib>=4.2
66
requests>=2.18
7-
Django==2.2.28
7+
Django==4.0.5
88
pytest>=4.0.1
99
fuzzywuzzy>=0.17.0
1010
python-Levenshtein>=0.12.0

0 commit comments

Comments
 (0)