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

Author: markcampanelli

ci/requirements-py3.10.yml

@@ -19,7 +19,7 @@ dependencies:
     - pytest-rerunfailures
     - conda-forge::pytest-remotedata  # version in default channel is old
     - python=3.10
-    # - pytz
+    - pytz
     - requests
     - scipy >= 1.6.0
     - statsmodels

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

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

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

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

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`)
+
+

docs/tutorials/solarposition.ipynb

@@ -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([
         timestamp.replace(year=year, tzinfo=tzname)
         for timestamp in tmy_data.index],

pvlib/iotools/pvgis.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 = ""
-
-        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']

pvlib/location.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