fix tests, again

Author: kandersolar

pvlib/iotools/ecmwf.py

@@ -126,7 +126,8 @@ def get_era5(latitude, longitude, start, end, variables, api_key,
         }
     }
     slug = "processes/reanalysis-era5-single-levels-timeseries/execution"
-    response = requests.post(url + slug, json=params, headers=headers)
+    response = requests.post(url + slug, json=params, headers=headers,
+                             timeout=timeout)
     submission_response = response.json()
     if not response.ok:
         raise Exception(submission_response)  # likely need to accept license
@@ -138,7 +139,7 @@ def get_era5(latitude, longitude, start, end, variables, api_key,
     poll_interval = 1
     num_polls = 0
     while True:
-        response = requests.get(url + slug, headers=headers)
+        response = requests.get(url + slug, headers=headers, timeout=timeout)
         poll_response = response.json()
         job_status = poll_response['status']
 
@@ -162,12 +163,12 @@ def get_era5(latitude, longitude, start, end, variables, api_key,
 
     # Step 3: get the download link for our requested dataset
     slug = "jobs/" + job_id + "/results"
-    response = requests.get(url + slug, headers=headers)
+    response = requests.get(url + slug, headers=headers, timeout=timeout)
     results_response = response.json()
     download_url = results_response['asset']['value']['href']
 
     # Step 4: finally, download our dataset.  it's a zipfile of one CSV
-    response = requests.get(download_url)
+    response = requests.get(download_url, timeout=timeout)
     zipbuffer = BytesIO(response.content)
     archive = zipfile.ZipFile(zipbuffer)
     filename = archive.filelist[0].filename

tests/conftest.py

@@ -139,7 +139,7 @@ def nrel_api_key():
     has_ecmwf_credentials = False
 
 requires_ecmwf_credentials = pytest.mark.skipif(
-    not has_solaranywhere_credentials,
+    not has_ecmwf_credentials,
     reason='requires ECMWF credentials')
 
 

tests/iotools/test_ecmwf.py

@@ -15,7 +15,7 @@ def params():
 
     return {
         'latitude': 40.01, 'longitude': -80.01,
-        'start': '2020-06-01', 'end': '2020-06-02',
+        'start': '2020-06-01', 'end': '2020-06-01',
         'variables': ['ghi', 'temp_air'],
         'api_key': api_key,
     }
@@ -41,7 +41,7 @@ def expected():
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_get_era5(params, expected):
     df, meta = pvlib.iotools.get_era5(**params)
-    pd.testing.assert_frame_equal(df, expected, check_freq=False)
+    pd.testing.assert_frame_equal(df, expected, check_freq=False, atol=0.1)
     assert meta['longitude'] == -80.0
     assert meta['latitude'] == 40.0
     assert isinstance(meta['jobID'], str)
@@ -53,7 +53,9 @@ def test_get_era5(params, expected):
 def test_get_era5_map_variables(params, expected):
     df, meta = pvlib.iotools.get_era5(**params, map_variables=False)
     expected = expected.rename(columns={'temp_air': 't2m', 'ghi': 'ssrd'})
-    pd.testing.assert_frame_equal(df, expected, check_freq=False)
+    expected['t2m'] += 273.15  # undo unit conversions
+    expected['ssrd'] *= 3600
+    pd.testing.assert_frame_equal(df, expected, check_freq=False, atol=0.1)
     assert meta['longitude'] == -80.0
     assert meta['latitude'] == 40.0
     assert isinstance(meta['jobID'], str)