Merge pull request #336 from jeffreykirchner/dev

Dev

main/tests/test_consumption.py

@@ -27,6 +27,9 @@ def setUp(self):
         sys._called_from_test = True
         logger = logging.getLogger(__name__)
 
+        #wolfram alpha:
+        #oPower[\(40)β * Power[m,Divide[1,α]] + β * Power[n,Divide[1,α]]\(41),α],β=0.564,m=8,n=8,o=2.2,α=10
+
         logger.info('setup tests')
 
         self.session = Session.objects.get(title="Test 1")    
@@ -70,7 +73,7 @@ def test_house_three_good(self):
         self.assertEqual(v, '0.0')
 
         v = convert_goods_to_health(8, 8, 8, self.parameter_set)
-        self.assertEqual(v, '51.2')
+        self.assertEqual(v, '58.7')
 
 
 

requirements.txt

@@ -11,13 +11,13 @@ charset-normalizer==3.1.0
 constantly==15.1.0
 crispy-bootstrap5==0.7
 cryptography==42.0.8
-daphne==4.0.0
-Django==4.2.14
+daphne==4.1.2
+Django==4.2.15
 django-crispy-forms==2.0
 django-tinymce==4.1.0
 hyperlink==21.0.0
 idna==3.7
-incremental==22.10.0
+incremental==24.7.2
 iniconfig==2.0.0
 msgpack==1.0.5
 packaging==23.0
@@ -39,7 +39,7 @@ service-identity==21.1.0
 setuptools==70.0.0
 six==1.16.0
 sqlparse==0.5.0
-Twisted==23.10.0
+Twisted==24.7.0
 txaio==23.1.1
 typing_extensions==4.8.0
 urllib3==2.2.2