merge from dev

ocadotechnology · Jan 24, 2024 · 9e88009 · 9e88009
2 parents 0ad5a44 + 558feaf
commit 9e88009
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 31 deletions.
diff --git a/.vscode/workspace.code-snippets b/.vscode/workspace.code-snippets
@@ -11,7 +11,7 @@
       "© Ocado Group",
       "Created on $CURRENT_DATE/$CURRENT_MONTH/$CURRENT_YEAR at $CURRENT_HOUR:$CURRENT_MINUTE:$CURRENT_SECOND($CURRENT_TIMEZONE_OFFSET)."
       "",
-      "${1:__description__}",      
+      "${1:__description__}",
       "\"\"\""
     ]
   },
@@ -26,7 +26,7 @@
       " * © Ocado Group",
       " * Created on $CURRENT_DATE/$CURRENT_MONTH/$CURRENT_YEAR at $CURRENT_HOUR:$CURRENT_MINUTE:$CURRENT_SECOND($CURRENT_TIMEZONE_OFFSET)."
       " *",
-      " * ${1:__description__}",      
+      " * ${1:__description__}",
       " */"
     ]
   },

diff --git a/backend/Pipfile b/backend/Pipfile
@@ -27,8 +27,8 @@ django-import-export = "*"
 google-cloud-logging = "==1.*"
 google-auth = "==2.*"
 google-cloud-container = "==2.3.0"
-"django-anymail[amazon_ses]" = "==7.0.*"
-codeforlife = {ref = "enable_disable_otp", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+# "django-anymail[amazon_ses]" = "==7.0.*"
+codeforlife = {ref = "v0.9.5", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 django = "==3.2.20"
 djangorestframework = "==3.13.1"
 django-cors-headers = "==4.1.0"

diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock
diff --git a/backend/api/signals/user.py b/backend/api/signals/user.py
@@ -5,14 +5,14 @@
 All signals for the User model.
 """
 
+import pyotp
 from codeforlife.models.signals.pre_save import (
     previous_values_are_unequal,
     was_created,
 )
 from codeforlife.user.models import User, UserProfile
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
-import pyotp
 
 # pylint: disable=unused-argument