diff --git a/backend/metagenedb/api/catalog/urls.py b/backend/metagenedb/api/catalog/urls.py index 1d920ce0db195427839210f8471a266117d28b8e..f71083be3190f1610505b0052e27ceecc13c9585 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 502db40713ba2217d36ac1ffb899cdb6b7668b21..882da11bd8b5bc21d2c15ec36d60672c2d3bb575 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 03aa55aa3b56bfec4b9f90a9f53b2a326c66b501..17db747e2497b10ea5aeb7521124234a61e89981 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')), ]