warning wednesday

rowers/interactiveplots.py

@@ -1926,7 +1926,7 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
     df.sort_values(['date'],inplace=True)
     df = df.groupby(['date']).max()
     df['date'] = df.index.values
-    mask = df['date'] > np.datetime64(startdate)
+    mask = df['date'] > np.datetime64(startdate.astimezone(tz=datetime.timezone.utc).replace(tzinfo=None))
     df = df.loc[mask]
 
 

rowers/tests/mocks.py

@@ -761,7 +761,8 @@ def mocked_requests(*args, **kwargs):
         'available-user-data': []
         }
 
-    c2workoutlist = json.load(open('rowers/tests/testdata/c2workoutlist.txt'))
+    with open('rowers/tests/testdata/c2workoutlist.txt') as f:
+        c2workoutlist = json.load(f)
 
     c2uploadjson = {
         "data": {
@@ -782,29 +783,52 @@ def mocked_requests(*args, **kwargs):
         }
     }
 
-    stravaworkoutlist = json.load(open('rowers/tests/testdata/stravaworkoutlist.txt'))
+    with open('rowers/tests/testdata/stravaworkoutlist.txt') as f:
-    sporttracksworkoutlist = json.load(open('rowers/tests/testdata/sporttracksworkouts.txt'))
+        stravaworkoutlist = json.load(f)
+
+    with open('rowers/tests/testdata/sporttracksworkouts.txt') as f:
+        sporttracksworkoutlist = json.load(f)
 
     #nkworkoutlist = json.load(open('rowers/tests/testdata/nkworkouts.txt'))
 
-    rkworkoutlistjson = json.load(open('rowers/tests/testdata/rkworkoutslist.txt','r'))
-    uaworkoutlistjson = json.load(open('rowers/tests/testdata/uaworkoutlist.txt','r'))
 
-    stravasummaryjson = json.load(open('rowers/tests/testdata/stravaworkoutsummary.txt','r'))
+    with open('rowers/tests/testdata/rkworkoutslist.txt','r') as f:
+        rkworkoutlistjson = json.load(f)
 
-    stravatimejson = json.load(open('rowers/tests/testdata/stravatimetestdata.txt','r'))
+    with open('rowers/tests/testdata/uaworkoutlist.txt','r') as f:
-    stravavelojson = json.load(open('rowers/tests/testdata/stravavelotestdata.txt','r'))
+        uaworkoutlistjson = json.load(f)
 
-    stravapowerjson = json.load(open('rowers/tests/testdata/stravapowertestdata.txt','r'))
+    with open('rowers/tests/testdata/stravaworkoutsummary.txt','r') as f:
+        stravasummaryjson = json.load(f)
 
-    stravadistancejson = json.load(open('rowers/tests/testdata/stravadistancetestdata.txt','r'))
+    with open('rowers/tests/testdata/stravatimetestdata.txt','r') as f:
-    stravalatlongjson = json.load(open('rowers/tests/testdata/stravalatlongtestdata.txt','r'))
+        stravatimejson = json.load(f)
-    stravahrjson = json.load(open('rowers/tests/testdata/stravahrtestdata.txt','r'))
-    stravaspmjson = json.load(open('rowers/tests/testdata/stravaspmtestdata.txt','r'))
 
-    uapostworkoutjson = json.load(open('rowers/tests/testdata/uapostworkoutresponse.txt','r'))
+    with open('rowers/tests/testdata/stravavelotestdata.txt','r') as f:
+        stravavelojson = json.load(f)
 
-    tpuploadresponse = json.load(open('rowers/tests/testdata/tpuploadresponse.txt','r'))
+    with open('rowers/tests/testdata/stravapowertestdata.txt','r') as f:
+        stravapowerjson = json.load(f)
+
+    with open('rowers/tests/testdata/stravadistancetestdata.txt','r') as f:
+        stravadistancejson = json.load(f)
+
+    with open('rowers/tests/testdata/stravalatlongtestdata.txt','r') as f:
+        stravalatlongjson = json.load(f)
+
+    with open('rowers/tests/testdata/stravahrtestdata.txt','r') as f:
+        stravahrjson = json.load(f)
+
+    with open('rowers/tests/testdata/stravaspmtestdata.txt','r') as f:
+        stravaspmjson = json.load(f)
+
+
+    with open('rowers/tests/testdata/uapostworkoutresponse.txt','r') as f:
+        uapostworkoutjson = json.load(f)
+
+
+    with open('rowers/tests/testdata/tpuploadresponse.txt','r') as f:
+        tpuploadresponse = json.load(f)
 
     stravastreamjson = {
         'time':stravatimejson,
@@ -816,15 +840,23 @@ def mocked_requests(*args, **kwargs):
         'watts':stravapowerjson,
         }
 
-    ststrokesjson = json.load(open('rowers/tests/testdata/sporttracksstrokedata.txt','r'))
+    with open('rowers/tests/testdata/sporttracksstrokedata.txt','r') as f:
-    ststrokesjson_nogps = json.load(open('rowers/tests/testdata/sporttracksstrokedatanolocation.txt','r'))
+        ststrokesjson = json.load(f)
 
-    rkstrokesjson = json.load(open('rowers/tests/testdata/rkstrokes.txt','r'))
+    with open('rowers/tests/testdata/sporttracksstrokedatanolocation.txt','r') as f:
+        ststrokesjson_nogps = json.load(f)
 
-    uastrokesjson = json.load(open('rowers/tests/testdata/uastrokes.txt','r'))
+    with open('rowers/tests/testdata/rkstrokes.txt','r') as f:
-    uauserjson = json.load(open('rowers/tests/testdata/uauser.txt','r'))
+        rkstrokesjson = json.load(f)
 
-    stravaathletejson = json.load(open('rowers/tests/testdata/strava_athlete.txt'))
+    with open('rowers/tests/testdata/uastrokes.txt','r') as f:
+        uastrokesjson = json.load(f)
+
+    with open('rowers/tests/testdata/uauser.txt','r') as f:
+        uauserjson = json.load(f)
+
+    with open('rowers/tests/testdata/strava_athlete.txt') as f:
+        stravaathletejson = json.load(f)
 
     class MockResponse:
         def __init__(self, json_data, status_code):

rowers/tests/test_imports.py

@@ -73,7 +73,9 @@ class GarminObjects(DjangoTestCase):
             w.delete()
 
     def test_garmin_push_summaries(self):
-        data = json.load(open('rowers/tests/testdata/garminsummarydata.txt','r'))
+
+        with open('rowers/tests/testdata/garminsummarydata.txt','r') as f:
+            data = json.load(f)
         response = self.c.post('/rowers/garmin/summaries/',json.dumps(data),
                                content_type="application/json")
         self.assertEqual(response.status_code, 200)
@@ -85,7 +87,8 @@ class GarminObjects(DjangoTestCase):
         self.assertEqual(ws.count(),3)
 
     def test_garmin_push_details3(self):
-        data = json.load(open('rowers/tests/testdata/garmindetail3.txt','r'))
+        with open('rowers/tests/testdata/garmindetail3.txt','r') as f:
+            data = json.load(f)
         response = self.c.post('/rowers/garmin/activities/',json.dumps(data),
                               content_type='application/json')
 
@@ -99,7 +102,8 @@ class GarminObjects(DjangoTestCase):
         self.assertEqual(len(data),515)
 
     def test_garmin_push_details4(self):
-        data = json.load(open('rowers/tests/testdata/garmindetail4.txt','r'))
+        with open('rowers/tests/testdata/garmindetail4.txt','r') as f:
+            data = json.load(f)
         response = self.c.post('/rowers/garmin/activities/',json.dumps(data),
                               content_type='application/json')
 
@@ -113,7 +117,8 @@ class GarminObjects(DjangoTestCase):
         self.assertEqual(len(data),18)
 
     def test_garmin_push_details2(self):
-        data = json.load(open('rowers/tests/testdata/garmindetail2.txt','r'))
+        with open('rowers/tests/testdata/garmindetail2.txt','r') as f:
+            data = json.load(f)
         response = self.c.post('/rowers/garmin/activities/',json.dumps(data),
                               content_type='application/json')
 
@@ -126,7 +131,8 @@ class GarminObjects(DjangoTestCase):
         self.assertEqual(len(data),451)
 
     def test_garmin_push_details1(self):
-        data = json.load(open('rowers/tests/testdata/garmindetail1.txt','r'))
+        with open('rowers/tests/testdata/garmindetail1.txt','r') as f:
+            data = json.load(f)
         response = self.c.post('/rowers/garmin/activities/',json.dumps(data),
                               content_type='application/json')
 

rowers/tests/test_uploads.py

@@ -644,6 +644,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -680,6 +681,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -715,6 +717,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -752,6 +755,7 @@ class ViewTest(TestCase):
             form = DocumentsForm(form_data,file_data)
 
             response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+            f.close()
             self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
             self.assertEqual(response.status_code, 200)
@@ -789,6 +793,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -824,6 +829,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -861,6 +867,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -898,6 +905,7 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
+        f.close()
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
         self.assertEqual(response.status_code, 200)
@@ -943,3 +951,5 @@ class ViewTest(TestCase):
             os.remove(f_to_be_deleted+'.gz')
         except (FileNotFoundError,OSError):
             pass
+
+        f.close()