Revert to just pyproject.toml changes (no zoneinfo changes)

pvlib · markcampanelli · Dec 22, 2024 · Dec 23, 2024 · Dec 23, 2024 · Dec 23, 2024
commit 8aee6cd661a1fcc0f26f3793e2da662fcb3011fe
diff --git a/ci/requirements-py3.10.yml b/ci/requirements-py3.10.yml
@@ -19,7 +19,7 @@ dependencies:
     - pytest-rerunfailures
     - conda-forge::pytest-remotedata  # version in default channel is old
     - python
8000
=3.10
-    # - pytz
+    - pytz
     - requests
     - scipy >= 1.6.0
     - statsmodels

diff --git a/ci/requirements-py3.11.yml b/ci/requirements-py3.11.yml
@@ -19,7 +19,7 @@ dependencies:
     - pytest-rerunfailures
     - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.11
-    # - pytz
+    - pytz
     - requests
     - scipy >= 1.6.0
     - statsmodels

diff --git a/ci/requirements-py3.12.yml b/ci/requirements-py3.12.yml
@@ -19,7 +19,7 @@ dependencies:
     - pytest-rerunfailures
     - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.12
-    # - pytz
+    - pytz
     - requests
     - scipy >= 1.6.0
     - statsmodels

diff --git a/ci/requirements-py3.9-min.yml b/ci/requirements-py3.9-min.yml
@@ -9,7 +9,7 @@ dependencies:
     - pytest-mock
     - pytest-timeout
     - python=3.9
-    # - pytz
+    - pytz
     - requests
     - pip:
         - h5py==3.0.0

diff --git a/ci/requirements-py3.9.yml b/ci/requirements-py3.9.yml
@@ -19,7 +19,7 @@ dependencies:
     - pytest-rerunfailures
     - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.9
-    # - pytz
+    - pytz
     - requests
     - scipy >= 1.6.0
     - statsmodels

diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst
@@ -18,7 +18,6 @@ Documentation
 
 Testing
 ~~~~~~~
-* Add tests for time conversions in tools package. (:issue:`2340`, :pull:`2341`)
 
 
 Requirements
@@ -27,4 +26,5 @@ Requirements
 
 Contributors
 ~~~~~~~~~~~~
-* Mark Campanellli (:ghuser:`markcampanelli`)
+
+
diff --git a/docs/tutorials/solarposition.ipynb b/docs/tutorials/solarposition.ipynb
diff --git a/pvlib/iotools/pvgis.py b/pvlib/iotools/pvgis.py
@@ -17,12 +17,10 @@
 import io
 import json
 from pathlib import Path
-from zoneinfo import ZoneInfo
-
 import requests
 import numpy as np
 import pandas as pd
-
+import pytz
 from pvlib.iotools import read_epw, parse_epw
 
 URL = 'https://re.jrc.ec.europa.eu/api/'
@@ -400,10 +398,10 @@ def _coerce_and_roll_tmy(tmy_data, tz, year):
     re-interpreted as zero / UTC.
     """
     if tz:
-        tzname = ZoneInfo(f'Etc/GMT{-tz:+d}')
+        tzname = pytz.timezone(f'Etc/GMT{-tz:+d}')
     else:
         tz = 0
-        tzname = ZoneInfo('UTC')
+        tzname = pytz.timezone('UTC')
     new_index = pd.DatetimeIndex([
        
F438
 timestamp.replace(year=year, tzinfo=tzname)
         for timestamp in tmy_data.index],

diff --git a/pvlib/location.py b/pvlib/location.py
@@ -4,16 +4,14 @@
 
 # Will Holmgren, University of Arizona, 2014-2016.
 
-import datetime
 import pathlib
-from zoneinfo import ZoneInfo
+import datetime
 
-import h5py
 import pandas as pd
-# import pytz
+import pytz
+import h5py
 
-from pvlib import atmosphere, clearsky, irradiance, solarposition
-# from pvlib._deprecation import warn_deprecated
+from pvlib import solarposition, clearsky, atmosphere, irradiance
 from pvlib.tools import _degrees_to_index
 
 
@@ -23,12 +21,10 @@ class Location:
     timezone, and altitude data associated with a particular
     geographic location. You can also assign a name to a location object.
 
-    Location objects have one timezone attribute:
-
-        * ``tz`` is a IANA-compatible standard-library zoneinfo.ZoneInfo.
+    Location objects have two timezone attributes:
 
-    Thus, the passed timezone must be representable by one of the values in
-    zoneinfo.available_timezones().
+        * ``tz`` is a IANA timezone string.
+        * ``pytz`` is a pytz timezone object.
 
     Location objects support the print method.
 
@@ -42,13 +38,12 @@ class Location:
         Positive is east of the prime meridian.
         Use decimal degrees notation.
 
-    tz : str, int, float, zoneinfo.ZoneInfo, datetime.timezone, or pytz
-        timezone (deprecated), default 'UTC'.
-        See http://en.wikipedia.org/wiki/List_of_tz_database_time_zones for a
-        list of valid time zone strings, or use the function
-        zoneinfo.available_timezones().
-        ints and floats must be in hours N from UTC, and are converted to the
-        Etc/GMT+N or Etc/GMT-N format depending on the sign of N.
+    tz : str, int, float, or pytz.timezone, default 'UTC'.
+        See
+        http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        for a list of valid time zones.
+        pytz.timezone objects will be converted to strings.
+        ints and floats must be in hours from UTC.
 
     altitude : float, optional
         Altitude from sea level in meters.
@@ -64,43 +59,33 @@ class Location:
     pvlib.pvsystem.PVSystem
     """
 
-    def __init__(
-        self, latitude, longitude, tz='UTC', altitude=None, name=None
-    ):
-
-        if name is None:
-            name = ""
-<
10000
br>
-        self.name = name
+    def __init__(self, latitude, longitude, tz='UTC', altitude=None,
+                 name=None):
 
         self.latitude = latitude
         self.longitude = longitude
 
+        if isinstance(tz, str):
+            self.tz = tz
+            self.pytz = pytz.timezone(tz)
+        elif isinstance(tz, datetime.timezone):
+            self.tz = 'UTC'
+            self.pytz = pytz.UTC
+        elif isinstance(tz, datetime.tzinfo):
+            self.tz = tz.zone
+            self.pytz = tz
+        elif isinstance(tz, (int, float)):
+            self.tz = tz
+            self.pytz = pytz.FixedOffset(tz*60)
+        else:
+            raise TypeError('Invalid tz specification')
+
         if altitude is None:
             altitude = lookup_altitude(latitude, longitude)
 
         self.altitude = altitude
 
-        if isinstance(tz, str):
-            self.tz = ZoneInfo(tz)
-        elif isinstance(tz, int):
-            self.tz = ZoneInfo(f"Etc/GMT{-tz:+d}")
-        elif isinstance(tz, float):
-            self.tz = ZoneInfo(f"Etc/GMT{int(-tz):+d}")
-        elif isinstance(tz, ZoneInfo):
-            self.tz = tz
-        elif isinstance(tz, datetime.timezone):
-            self.tz = ZoneInfo(str(tz))
-        # elif isinstance(tz, pytz.BaseTzInfo):
-        #     warn_deprecated(
-        #         "0.11.3",
-        #         message='pytz-based timezones are deprecated for locations',
-        #         alternative='use zoneinfo.ZoneInfo from standard library',
-        #         obj_type='function argument type',
-        #     )
-        #     self.tz = ZoneInfo(tz.zone)
-        else:
-            raise TypeError(f'Invalid tz specification: {tz}')
+        self.name = name
 
     def __repr__(self):
         attrs = ['name', 'latitude', 'longitude', 'altitude', 'tz']

diff --git a/pvlib/temperature.py b/pvlib/temperature.py
@@ -6,6 +6,7 @@
 import numpy as np
 import pandas as pd
 from pvlib.tools import sind
+from pvlib._deprecation import warn_deprecated
 from pvlib.tools import _get_sample_intervals
 import scipy
 import scipy.constants

diff --git a/pvlib/tests/iotools/test_midc.py b/pvlib/tests/iotools/test_midc.py
@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+import pytz
 
 from pvlib.iotools import midc
 from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
@@ -42,7 +43,7 @@ def test_midc__format_index_tz_conversion():
     data = pd.read_csv(MIDC_TESTFILE)
     data = data.rename(columns={'MST': 'PST'})
     data = midc._format_index(data)
-    assert str(data.index[0].tz) == 'Etc/GMT+8'
+    assert data.index[0].tz == pytz.timezone('Etc/GMT+8')
 
 
 def test_midc__format_index_raw():

diff --git a/pvlib/tests/test_clearsky.py b/pvlib/tests/test_clearsky.py
@@ -1,9 +1,9 @@
 from collections import OrderedDict
-from zoneinfo import ZoneInfo
 
 import numpy as np
 from numpy import nan
 import pandas as pd
+import pytz
 from scipy.linalg import hankel
 
 import pytest
@@ -758,7 +758,7 @@ def test_bird():
     times = pd.date_range(start='1/1/2015 0:00', end='12/31/2015 23:00',
                           freq='h')
     tz = -7  # test timezone
-    gmt_tz = ZoneInfo(f"Etc/GMT{-tz:+}")
+    gmt_tz = pytz.timezone('Etc/GMT%+d' % -(tz))
     times = times.tz_localize(gmt_tz)  # set timezone
     times_utc = times.tz_convert('UTC')
     # match test data from BIRD_08_16_2012.xls

diff --git a/pvlib/tests/test_location.py b/pvlib/tests/test_location.py
@@ -1,14 +1,15 @@
 import datetime
 from unittest.mock import ANY
-from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 import numpy as np
 from numpy import nan
 import pandas as pd
 from .conftest import assert_frame_equal, assert_index_equal
 
 import pytest
-# import pytz
+
+import pytz
+from pytz.exceptions import UnknownTimeZoneError
 
 import pvlib
 from pvlib import location
@@ -26,23 +27,16 @@ def test_location_all():
     Location(32.2, -111, 'US/Arizona', 700, 'Tucson')
 
 
-@pytest.mark.parametrize(
-    'tz',
-    [
-        # pytz.timezone('US/Arizona'),
-        ZoneInfo('US/Arizona'),
-        'America/Phoenix',
-        -7,
-        -7.0,
-        datetime.timezone.utc,
-    ]
-)
+@pytest.mark.parametrize('tz', [
+    pytz.timezone('US/Arizona'), 'America/Phoenix',  -7, -7.0,
+    datetime.timezone.utc
+])
 def test_location_tz(tz):
     Location(32.2, -111, tz)
 
 
 def test_location_invalid_tz():
-    with pytest.raises(ZoneInfoNotFoundError):
+    with pytest.raises(UnknownTimeZoneError):
         Location(32.2, -111, 'invalid')
 
 
@@ -64,8 +58,8 @@ def test_location_print_all():
     assert tus.__str__() == expected_str
 
 
-def test_location_print_zoneinfo():
-    tus = Location(32.2, -111, ZoneInfo('US/Arizona'), 700, 'Tucson')
+def test_location_print_pytz():
+    tus = Location(32.2, -111, pytz.timezone('US/Arizona'), 700, 'Tucson')
     expected_str = '\n'.join([
         'Location: ',
         '  name: Tucson',
@@ -221,7 +215,7 @@ def test_from_tmy_3():
     from pvlib.iotools import read_tmy3
     data, meta = read_tmy3(TMY3_TESTFILE, map_variables=True)
     loc = Location.from_tmy(meta, data)
-    assert loc.name != ""
+    assert loc.name is not None
     assert loc.altitude != 0
     assert loc.tz != 'UTC'
     assert_frame_equal(loc.weather, data)
@@ -232,7 +226,7 @@ def test_from_tmy_2():
     from pvlib.iotools import read_tmy2
     data, meta = read_tmy2(TMY2_TESTFILE)
     loc = Location.from_tmy(meta, data)
-    assert loc.name != ""
+    assert loc.name is not None
     assert loc.altitude != 0
     assert loc.tz != 'UTC'
     assert_frame_equal(loc.weather, data)
@@ -243,7 +237,7 @@ def test_from_epw():
     from pvlib.iotools import read_epw
     data, meta = read_epw(epw_testfile)
     loc = Location.from_epw(meta, data)
-    assert loc.name != ""
+    assert loc.name is not None
     assert loc.altitude != 0
     assert loc.tz != 'UTC'
     assert_frame_equal(loc.weather, data)