Update test_solarposition.py

Author: kandersolar

tests/test_solarposition.py

@@ -142,20 +142,15 @@ def test_spa_python_numpy_physical_dst(expected_solpos, golden):
 
 @pytest.mark.parametrize('delta_t', [65.0, None, np.array([65, 65])])
 def test_sun_rise_set_transit_spa(expected_rise_set_spa, golden, delta_t):
-    # solution from NREL SAP web calculator
+    # solution from NREL SPA web calculator
     south = Location(-35.0, 0.0, tz='UTC')
-    times = pd.DatetimeIndex([datetime.datetime(1996, 7, 5, 0),
-                              datetime.datetime(2004, 12, 4, 0)]
-                             ).tz_localize('UTC')
-    sunrise = pd.DatetimeIndex([datetime.datetime(1996, 7, 5, 7, 8, 15),
-                                datetime.datetime(2004, 12, 4, 4, 38, 57)]
-                               ).tz_localize('UTC').tolist()
-    sunset = pd.DatetimeIndex([datetime.datetime(1996, 7, 5, 17, 1, 4),
-                               datetime.datetime(2004, 12, 4, 19, 2, 3)]
-                              ).tz_localize('UTC').tolist()
-    transit = pd.DatetimeIndex([datetime.datetime(1996, 7, 5, 12, 4, 36),
-                                datetime.datetime(2004, 12, 4, 11, 50, 22)]
-                               ).tz_localize('UTC').tolist()
+    times = pd.to_datetime(["1996-07-05", "2004-12-04"], utc=True)
+    sunrise = pd.to_datetime(["1996-07-05 07:08:15", "2004-12-04 04:38:57"],
+                             utc=True)
+    sunset = pd.to_datetime(["1996-07-05 17:01:04", "2004-12-04 19:02:03"],
+                            utc=True)
+    transit = pd.to_datetime(["1996-07-05 12:04:36", "2004-12-04 11:50:22"],
+                             utc=True)
     frame = pd.DataFrame({'sunrise': sunrise,
                           'sunset': sunset,
                           'transit': transit}, index=times)
@@ -169,7 +164,9 @@ def test_sun_rise_set_transit_spa(expected_rise_set_spa, golden, delta_t):
     for col, data in result.items():
         result_rounded[col] = data.dt.round('1s')
 
-    assert_frame_equal(frame, result_rounded)
+    assert_frame_equal(frame, result_rounded,
+                       check_dtype=False # ignore us/ns dtypes
+                       )
 
     # test for Golden, CO compare to NREL SPA
     result = solarposition.sun_rise_set_transit_spa(
@@ -182,7 +179,9 @@ def test_sun_rise_set_transit_spa(expected_rise_set_spa, golden, delta_t):
     for col, data in result.items():
         result_rounded[col] = data.dt.round('s').tz_convert('MST')
 
-    assert_frame_equal(expected_rise_set_spa, result_rounded)
+    assert_frame_equal(expected_rise_set_spa, result_rounded,
+                       check_dtype=False  # ignore us/ns dtypes
+                       )
 
 
 @requires_ephem
@@ -726,7 +725,10 @@ def test_hour_angle_with_tricky_timezones():
         '2014-09-07 02:00:00',
     ]).tz_localize('America/Santiago', nonexistent='shift_forward')
 
-    with pytest.raises(pytz.exceptions.NonExistentTimeError):
+    with pytest.raises((
+        pytz.exceptions.NonExistentTimeError,  # pandas 1.x, 2.x
+        ValueError,  # pandas 3.x
+    )):
         times.normalize()
 
     # should not raise `pytz.exceptions.NonExistentTimeError`
@@ -740,7 +742,10 @@ def test_hour_angle_with_tricky_timezones():
         '2014-11-02 02:00:00',
     ]).tz_localize('America/Havana', ambiguous=[True, True, False, False])
 
-    with pytest.raises(pytz.exceptions.AmbiguousTimeError):
+    with pytest.raises((
+        pytz.exceptions.AmbiguousTimeError,  # pandas 1.x, 2.x
+        ValueError,  # pandas 3.x
+    )):
         solarposition.hour_angle(times, longitude, eot)
 
 
@@ -798,8 +803,13 @@ def test_sun_rise_set_transit_geometric(expected_rise_set_spa, golden_mst):
 @pytest.mark.parametrize('tz', [None, 'utc', 'US/Eastern'])
 def test__datetime_to_unixtime(tz):
     # for pandas < 2.0 where "unit" doesn't exist in pd.date_range. note that
-    # unit of ns is the only option in pandas<2, and the default in pandas 2.x
-    times = pd.date_range(start='2019-01-01', freq='h', periods=3, tz=tz)
+    # unit of ns is the only option in pandas<2, and the default in pandas 2.x,
+    # but the default is us in pandas 3.x
+    kwargs = dict(start='2019-01-01', freq='h', periods=3, tz=tz)
+    try:
+        times = pd.date_range(**kwargs, unit='ns')  # pandas 2.x, 3.x
+    except:
+        times = pd.date_range(**kwargs)  # pandas 1.x
     expected = times.view(np.int64)/10**9
     actual = solarposition._datetime_to_unixtime(times)
     np.testing.assert_equal(expected, actual)