Merge branch 'cross-axis-whatever-name-consistent-name' of https://github.com/echedey-ls/pvlib-python into cross-axis-whatever-name-consistent-name

Author: echedey-ls

pvlib/iotools/acis.py

@@ -413,8 +413,8 @@ def get_acis_station_data(station, start, end, trace_val=0.001,
                  'climdiv,valid_daterange,tzo,network')
     }
     df, metadata = _get_acis(start, end, params, map_variables, url, **kwargs)
-    df = df.replace("M", np.nan)
-    df = df.replace("T", trace_val)
+    df = df.mask(df == 'M', np.nan)
+    df = df.mask(df == 'T', trace_val)
     df = df.astype(float)
     return df, metadata
 

pvlib/temperature.py

@@ -456,14 +456,14 @@ def faiman(poa_global, temp_air, wind_speed=1.0, u0=25.0, u1=6.84):
         speed at module height used to determine NOCT. [m/s]
 
     u0 : numeric, default 25.0
-        Combined heat loss factor coefficient. The default value is one
-        determined by Faiman for 7 silicon modules
+        Combined heat loss factor coefficient. The default value is for module
+        temperature determined by Faiman for 7 silicon modules
         in the Negev desert on an open rack at 30.9° tilt.
         :math:`\left[\frac{\text{W}/{\text{m}^2}}{\text{C}}\right]`
 
     u1 : numeric, default 6.84
-        Combined heat loss factor influenced by wind. The default value is one
-        determined by Faiman for 7 silicon modules
+        Combined heat loss factor influenced by wind. The default value is
+        for module temperature determined by Faiman for 7 silicon modules
         in the Negev desert on an open rack at 30.9° tilt.
         :math:`\left[ \frac{\text{W}/\text{m}^2}{\text{C}\ \left( \text{m/s} \right)} \right]`
 
@@ -539,14 +539,14 @@ def faiman_rad(poa_global, temp_air, wind_speed=1.0, ir_down=None,
         surface. [W/m^2]
 
     u0 : numeric, default 25.0
-        Combined heat loss factor coefficient. The default value is one
-        determined by Faiman for 7 silicon modules
+        Combined heat loss factor coefficient. The default value is for module
+        temperature determined by Faiman for 7 silicon modules
         in the Negev desert on an open rack at 30.9° tilt.
         :math:`\left[\frac{\text{W}/{\text{m}^2}}{\text{C}}\right]`
 
     u1 : numeric, default 6.84
-        Combined heat loss factor influenced by wind. The default value is one
-        determined by Faiman for 7 silicon modules
+        Combined heat loss factor influenced by wind. The default value is for
+        module temperature determined by Faiman for 7 silicon modules
         in the Negev desert on an open rack at 30.9° tilt.
         :math:`\left[ \frac{\text{W}/\text{m}^2}{\text{C}\ \left( \text{m/s} \right)} \right]`
 
@@ -713,8 +713,7 @@ def ross(poa_global, temp_air, noct=None, k=None):
         return temp_air + k * poa_global
 
 
-def _fuentes_hconv(tave, windmod, tinoct, temp_delta, xlen, tilt,
-                   check_reynold):
+def _fuentes_hconv(tave, windmod, temp_delta, xlen, tilt, check_reynold):
     # Calculate the convective coefficient as in Fuentes 1987 -- a mixture of
     # free, laminar, and turbulent convection.
     densair = 0.003484 * 101325.0 / tave  # density
@@ -836,7 +835,7 @@ def fuentes(poa_global, temp_air, wind_speed, noct_installed, module_height=5,
     # convective coefficient of top surface of module at NOCT
     windmod = 1.0
     tave = (tinoct + 293.15) / 2
-    hconv = _fuentes_hconv(tave, windmod, tinoct, tinoct - 293.15, xlen,
+    hconv = _fuentes_hconv(tave, windmod, tinoct - 293.15, xlen,
                            surface_tilt, False)
 
     # determine the ground temperature ratio and the ratio of the total
@@ -896,7 +895,7 @@ def fuentes(poa_global, temp_air, wind_speed, noct_installed, module_height=5,
         for j in range(10):
             # overall convective coefficient
             tave = (tmod + tamb) / 2
-            hconv = convrat * _fuentes_hconv(tave, windmod, tinoct,
+            hconv = convrat * _fuentes_hconv(tave, windmod,
                                              abs(tmod-tamb), xlen,
                                              surface_tilt, True)
             # sky radiation coefficient (Equation 3)

tests/iotools/test_meteonorm.py

@@ -124,7 +124,10 @@ def test_get_meteonorm_training(
 
     assert meta == expected_meta
     pd.testing.assert_index_equal(data.index, expected_meteonorm_index)
-    pd.testing.assert_frame_equal(data.iloc[:12], expected_meteonorm_data)
+    # meteonorm API only guarantees similar, not identical, results between
+    # calls.  so we allow a small amount of variation with atol.
+    pd.testing.assert_frame_equal(data.iloc[:12], expected_meteonorm_data,
+                                  check_exact=False, atol=1)
 
 
 @pytest.mark.remote_data
@@ -304,4 +307,7 @@ def test_get_meteonorm_tmy(
         map_variables=False,
         url=demo_url)
     assert meta == expected_meteonorm_tmy_meta
-    pd.testing.assert_frame_equal(data.iloc[:12], expected_meteonorm_tmy_data)
+    # meteonorm API only guarantees similar, not identical, results between
+    # calls.  so we allow a small amount of variation with atol.
+    pd.testing.assert_frame_equal(data.iloc[:12], expected_meteonorm_tmy_data,
+                                  check_exact=False, atol=1)

tests/iotools/test_sodapro.py

@@ -21,7 +21,8 @@
 
 index_verbose = pd.date_range('2020-06-01 12', periods=4, freq='1min',
                               tz='UTC')
-index_monthly = pd.date_range('2020-01-01', periods=4, freq='1M')
+index_monthly = pd.to_datetime(['2020-01-31', '2020-02-29', '2020-03-31',
+                                '2020-04-30'])
 
 
 dtypes_mcclear_verbose = [

tests/iotools/test_solargis.py

@@ -65,7 +65,8 @@ def test_get_solargis_utc_start_timestamp(hourly_index_start_utc):
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_get_solargis_http_error():
     # Test if HTTPError is raised if date outside range is specified
-    with pytest.raises(requests.HTTPError, match="data coverage"):
+    match = r"request fromDate .* is before the available start date"
+    with pytest.raises(requests.HTTPError, match=match):
         _, _ = pvlib.iotools.get_solargis(
             latitude=48.61259, longitude=20.827079,
             start='1920-01-01', end='1920-01-01',  # date outside range