From 557a134f5c685eb2929da0bad3b46dadd79dfd43 Mon Sep 17 00:00:00 2001
From: Kenzo-Hugo Hillion <kenzo-hugo.hillion1@pasteur.fr>
Date: Mon, 10 Aug 2020 16:59:48 +0200
Subject: [PATCH] fix DeprecationWarnings
---
backend/metagenedb/api/catalog/urls.py | 5 +++--
backend/metagenedb/common/utils/test_df_operations.py | 2 +-
backend/metagenedb/urls.py | 5 ++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/backend/metagenedb/api/catalog/urls.py b/backend/metagenedb/api/catalog/urls.py
index 1d920ce..f71083b 100644
--- a/backend/metagenedb/api/catalog/urls.py
+++ b/backend/metagenedb/api/catalog/urls.py
@@ -1,5 +1,6 @@
from django.urls import path
-from django.conf.urls import url, include
+from django.conf.urls import include
+from django.urls import re_path
from rest_framework.routers import DefaultRouter, DynamicRoute, Route
from metagenedb.api.catalog import views
@@ -64,7 +65,7 @@ api_router.register(r'statistics', views.StatisticsViewSet, basename='statistics
urlpatterns = [
- url(r'v1/', include((api_router.urls, 'v1'))),
+ re_path(r'v1/', include((api_router.urls, 'v1'))),
path('admin/', include(('metagenedb.api.catalog.admin_urls', 'admin'))),
path('celery-task-test/', test_task_view, name='celery-task-test'),
]
diff --git a/backend/metagenedb/common/utils/test_df_operations.py b/backend/metagenedb/common/utils/test_df_operations.py
index 502db40..882da11 100644
--- a/backend/metagenedb/common/utils/test_df_operations.py
+++ b/backend/metagenedb/common/utils/test_df_operations.py
@@ -1,7 +1,7 @@
from unittest import TestCase
import pandas as pd
-from pandas.util.testing import assert_series_equal
+from pandas.testing import assert_series_equal
from metagenedb.common.utils.df_operations import get_mask
diff --git a/backend/metagenedb/urls.py b/backend/metagenedb/urls.py
index 03aa55a..17db747 100644
--- a/backend/metagenedb/urls.py
+++ b/backend/metagenedb/urls.py
@@ -14,12 +14,11 @@ Including another URLconf
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
-from django.urls import include, path
-from django.conf.urls import url
+from django.urls import include, path, re_path
urlpatterns = [
path('api/', include(('metagenedb.api.urls', 'api'))),
path('admin/', admin.site.urls),
- url(r'^ht/', include('health_check.urls')),
+ re_path(r'^ht/', include('health_check.urls')),
]
--
GitLab