Merge branch 'feature/activity_types_fix' into 'master'

Fixed error in placeholder for secondary school (data registry defaults) See merge request caimira/caimira!494
CERN · May 24, 2024 · 4ca9816 · 4ca9816
2 parents d2a867f + 6b6824c
commit 4ca9816
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/caimira/store/data_registry.py b/caimira/store/data_registry.py
@@ -441,7 +441,7 @@ class DataRegistry:
             "expiration": {"Breathing": 5, "Speaking": 5},
         },
         "secondary-school": {
-            "placeholder": "Primary school",
+            "placeholder": "Secondary school",
             "activity": "Light activity",
             "expiration": {"Breathing": 7, "Speaking": 3},
         },

diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
     ],
     'app': [],
     'test': [
-        'pytest',
+        'pytest < 8.2',
         'pytest-mypy >= 0.10.3',
         'mypy >= 1.0.0',
         'pytest-tornasync',