Merge pull request #168 from TheLabbingProject/dj

Updated django version

Author: ZviBaratz

accounts/serializers/user.py

@@ -4,7 +4,7 @@
 from accounts.models.profile import Profile
 from accounts.models.user import User
 from accounts.serializers.profile import ProfileSerializer
-from rest_auth.serializers import UserDetailsSerializer
+from dj_rest_auth.serializers import UserDetailsSerializer
 
 
 class UserSerializer(UserDetailsSerializer):

pylabber/settings.py

@@ -12,6 +12,7 @@
 
 # import django_heroku
 import environ
+
 from django_mri.analysis.mri_interfaces import interfaces
 from django_mri.analysis.mri_output_parsers import MRI_OUTPUT_PARSERS
 from django_mri.utils.export import EXPORT_MUTATORS
@@ -78,12 +79,12 @@
     "django_filters",
     "rest_framework",
     "rest_framework.authtoken",
-    "rest_auth",
     "corsheaders",
     "storages",
     "django_celery_results",
     "django_admin_inline_paginator",
     "debug_toolbar",
+    "dj_rest_auth",
     # Local
     "research",
     "external_tables",

pylabber/urls.py

@@ -35,7 +35,7 @@
     path("api/", include("research.urls", namespace="research")),
     path("api/", include("django_mri.urls", namespace="mri")),
     path("api/", include("django_analyses.urls", namespace="analyses")),
-    path("api/auth/", include("rest_auth.urls")),
+    path("api/auth/", include("dj_rest_auth.urls")),
     path("__debug__/", include("debug_toolbar.urls")),
 ]
 

requirements.txt

@@ -3,11 +3,11 @@ boto3~=1.14
 bs4~=0.0
 celery>=5.1.2
 dask
-Django~=3.2
+Django~=4.1
 django-admin-inline-paginator~=0.1
 django-debug-toolbar~=3.2
 django-nonrelated-inlines~=0.1
-djangorestframework~=3.12
+djangorestframework~=3.14
 djangorestframework_camel_case~=1.1
 django-celery-beat~=2.1
 django-celery-results~=2.0
@@ -19,7 +19,7 @@ django-heroku==0.3.1
 django-mirage-field
 django-model-utils==4.*
 django-nonrelated-inlines~=0.1
-django-rest-auth~=0.9
+dj_rest_auth~=3.0
 django-storages~=1.9
 gunicorn==20.0.4
 matplotlib~=3.3
@@ -49,5 +49,4 @@ git+https://github.com/TheLabbingProject/django_mri.git@master#egg=django_mri
 git+https://github.com/TheLabbingProject/questionnaire_reader.git@main#egg=questionnaire_reader
 git+https://github.com/open-dicom/dicom_parser.git@main#egg=dicom_parser
 git+https://github.com/GalBenZvi/nipype@master#egg=nipype
-git+https://github.com/GalBenZvi/dwiprep@master#egg=dwiprep
-git+https://github.com/ZviBaratz/BrainPrint-python@main#egg=brainprint
+git+https://github.com/GalBenZvi/dwiprep@master#egg=dwiprep