preserve local changes after resetting to main

e06f37762819b6bb28361a620c52db1c9d478dc · Mar 24, 2025 · 2b7d9db · 2b7d9db
1 parent 6b96d52
commit 2b7d9db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -28,7 +28,7 @@ six==1.16.0
 sqlparse==0.5.1
 typing_extensions==4.12.2
 tzdata==2024.1
-urllib3==2.2.2
+urllib3>=1.25.4,<1.27
 validators==0.33.0
 win32-setctime==1.1.0
 djangorestframework-simplejwt==5.3.1
diff --git a/backend/tests/__init__.py b/backend/tests/__init__.py
@@ -0,0 +1 @@
+#Marks this folder as a python project
diff --git a/backend/tests/test_template.py b/backend/tests/test_template.py
@@ -1,5 +1,15 @@
-from django.test import TestCase
+'''
+#This is for coverage testing independent of manage.py
+import os
+import django
+import sys
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'secfit.settings')  
+django.setup()
+'''
+
 from workouts.models import Exercise
+from django.test import TestCase
 
 
 class User(TestCase):
@@ -11,6 +21,6 @@ def setUp(self):
     def test_user_has_coach(self):
         all_exercises = Exercise.objects.all()
         num_reps = Exercise.objects.filter(unit="reps")
-
         self.assertEqual(len(all_exercises), 3)
         self.assertEqual(len(num_reps), 2)
+