fix: replace deprecated IANA timezone aliases with canonical names

dgowdaan-cmyk · dgowdaan-cmyk · commit fe06ece63c59 · 2026-06-28T22:13:01.000+05:30
diff --git a/docs/examples/irradiance-transposition/plot_ghi_transposition.py b/docs/examples/irradiance-transposition/plot_ghi_transposition.py
@@ -18,7 +18,7 @@
 from matplotlib import pyplot as plt
 
 # For this example, we will be using Golden, Colorado
-tz = 'MST'
+tz = 'America/Phoenix'
 lat, lon = 39.755, -105.221
 
 # Create location object to store lat, lon, timezone
diff --git a/docs/examples/shading/plot_simple_irradiance_adjustment_for_horizon_shading.py b/docs/examples/shading/plot_simple_irradiance_adjustment_for_horizon_shading.py
@@ -23,7 +23,7 @@
 
 # Golden, CO
 latitude, longitude = 39.76, -105.22
-tz = 'MST'
+tz = 'America/Phoenix'
 
 # Set times in the morning of the December solstice.
 times = pd.date_range(
diff --git a/docs/examples/solar-position/plot_sunpath_diagrams.py b/docs/examples/solar-position/plot_sunpath_diagrams.py
@@ -21,7 +21,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-tz = 'Asia/Calcutta'
+tz = 'Asia/Kolkata'
 lat, lon = 28.6, 77.2
 
 times = pd.date_range('2019-01-01 00:00:00', '2020-01-01', freq='h', tz=tz)
@@ -110,7 +110,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-tz = 'Asia/Calcutta'
+tz = 'Asia/Kolkata'
 lat, lon = 28.6, 77.2
 times = pd.date_range('2019-01-01 00:00:00', '2020-01-01', freq='h', tz=tz)
 
diff --git a/docs/examples/solar-tracking/plot_discontinuous_tracking.py b/docs/examples/solar-tracking/plot_discontinuous_tracking.py
@@ -50,7 +50,7 @@ def get_orientation(self, solar_zenith, solar_azimuth):
 # %%
 # Let's take a look at the tracker rotation curve it produces:
 
-times = pd.date_range('2019-06-01', '2019-06-02', freq='1min', tz='US/Eastern')
+times = pd.date_range('2019-06-01', '2019-06-02', freq='1min', tz='America/New_York')
 loc = location.Location(40, -80)
 solpos = loc.get_solarposition(times)
 mount = DiscontinuousTrackerMount(axis_azimuth=180, gcr=0.4)
diff --git a/docs/examples/solar-tracking/plot_single_axis_tracking.py b/docs/examples/solar-tracking/plot_single_axis_tracking.py
@@ -24,7 +24,7 @@
 import pandas as pd
 import matplotlib.pyplot as plt
 
-tz = 'US/Eastern'
+tz = 'America/New_York'
 lat, lon = 40, -80
 
 times = pd.date_range('2019-01-01', '2019-01-02', freq='5min',
diff --git a/docs/examples/solar-tracking/plot_single_axis_tracking_on_sloped_terrain.py b/docs/examples/solar-tracking/plot_single_axis_tracking_on_sloped_terrain.py
@@ -86,7 +86,7 @@
 import matplotlib.pyplot as plt
 
 # PV system parameters
-tz = 'US/Eastern'
+tz = 'America/New_York'
 lat, lon = 40, -80
 gcr = 0.4
 
diff --git a/docs/examples/system-models/oedi_9068.py b/docs/examples/system-models/oedi_9068.py
@@ -229,7 +229,7 @@
 
 fn = r"path/to/9068_ac_power_data.csv"
 df_inverter_measured = pd.read_csv(fn, index_col=0, parse_dates=True)
-df_inverter_measured = df_inverter_measured.tz_localize('US/Mountain',
+df_inverter_measured = df_inverter_measured.tz_localize('America/Denver',
                                                         ambiguous='NaT',
                                                         nonexistent='NaT')
 # convert to standard time to match the NSRDB-based simulation
diff --git a/docs/sphinx/source/user_guide/modeling_topics/clearsky.rst b/docs/sphinx/source/user_guide/modeling_topics/clearsky.rst
@@ -66,7 +66,7 @@ returns a :py:class:`pandas.DataFrame`.
 
 .. ipython::
 
-    In [1]: tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')
+    In [1]: tus = Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')
 
     In [1]: times = pd.date_range(start='2016-07-01', end='2016-07-04', freq='1min', tz=tus.tz)
 
@@ -264,7 +264,7 @@ A clear sky time series using only basic pvlib functions.
 
 .. ipython::
 
-    In [1]: latitude, longitude, tz, altitude, name = 32.2, -111, 'US/Arizona', 700, 'Tucson'
+    In [1]: latitude, longitude, tz, altitude, name = 32.2, -111, 'America/Phoenix', 700, 'Tucson'
 
     In [1]: times = pd.date_range(start='2014-01-01', end='2014-01-02', freq='1Min', tz=tz)
 
@@ -404,7 +404,7 @@ A clear sky time series using only basic pvlib functions.
 
 .. ipython::
 
-    In [1]: latitude, longitude, tz, altitude, name = 32.2, -111, 'US/Arizona', 700, 'Tucson'
+    In [1]: latitude, longitude, tz, altitude, name = 32.2, -111, 'America/Phoenix', 700, 'Tucson'
 
     In [1]: times = pd.date_range(start='2014-01-01', end='2014-01-02', freq='1Min', tz=tz)
 
diff --git a/docs/sphinx/source/user_guide/modeling_topics/modelchain.rst b/docs/sphinx/source/user_guide/modeling_topics/modelchain.rst
@@ -78,7 +78,7 @@ Next, we run a model with some simple weather data.
 
     weather = pd.DataFrame([[1050, 1000, 100, 30, 5]],
                            columns=['ghi', 'dni', 'dhi', 'temp_air', 'wind_speed'],
-                           index=[pd.Timestamp('20170401 1200', tz='US/Arizona')])
+                           index=[pd.Timestamp('20170401 1200', tz='America/Phoenix')])
 
     mc.run_model(weather)
 
diff --git a/docs/sphinx/source/user_guide/modeling_topics/timetimezones.rst b/docs/sphinx/source/user_guide/modeling_topics/timetimezones.rst
@@ -60,7 +60,7 @@ And you can also filter for GMT-based fixed offset zones:
 
     sorted(filter(lambda x: 'GMT' in x, zoneinfo.available_timezones()))
 
-Note that while the IANA database has ``'EST'`` and ``'MST'``, it does not have
+Note that while the IANA database has ``'EST'`` and ``'America/Phoenix'``, it does not have
 ``'PST'``. Use ``'Etc/GMT+8'`` instead, or see :ref:`fixedoffsets`.
 
 Timestamps
@@ -109,21 +109,21 @@ Daylight savings time
 *********************
 
 Some time zones are aware of daylight savings time and some are not. For
-example the winter time results are the same for US/Mountain and MST,
+example the winter time results are the same for America/Denver and MST,
 but the summer time results are not.
 
 Note the UTC offset in winter...
 
 .. ipython:: python
 
-    pd.Timestamp('2015-1-1 00:00').tz_localize('US/Mountain')
+    pd.Timestamp('2015-1-1 00:00').tz_localize('America/Denver')
     pd.Timestamp('2015-1-1 00:00').tz_localize('Etc/GMT+7')
 
 vs. the UTC offset in summer...
 
 .. ipython:: python
 
-    pd.Timestamp('2015-6-1 00:00').tz_localize('US/Mountain')
+    pd.Timestamp('2015-6-1 00:00').tz_localize('America/Denver')
     pd.Timestamp('2015-6-1 00:00').tz_localize('Etc/GMT+7')
 
 pandas makes this time zone handling possible because pandas
@@ -140,8 +140,8 @@ will use the same integer to represent them.
 
 .. ipython:: python
 
-    # US/Mountain
-    pd.Timestamp('2015-6-1 01:00', tz='US/Mountain').value
+    # America/Denver
+    pd.Timestamp('2015-6-1 01:00', tz='America/Denver').value
 
     # MST
     pd.Timestamp('2015-6-1 00:00', tz='Etc/GMT+7').value
@@ -219,7 +219,7 @@ expected.
     pd.Timestamp(naive_python_dt)
 
     # tz aware python datetime.datetime object using zoneinfo
-    aware_python_dt = naive_python_dt.replace(tzinfo=zoneinfo.ZoneInfo('US/Mountain'))
+    aware_python_dt = naive_python_dt.replace(tzinfo=zoneinfo.ZoneInfo('America/Denver'))
 
     # tz aware pandas Timestamp object
     pd.Timestamp(aware_python_dt)
@@ -243,7 +243,7 @@ convert it to a :py:class:`python:datetime.datetime`.
    :okexcept:
 
     # fail: datetime.date has no tzinfo support via replace
-    naive_python_date.replace(tzinfo=zoneinfo.ZoneInfo('US/Mountain'))
+    naive_python_date.replace(tzinfo=zoneinfo.ZoneInfo('America/Denver'))
 
 
 pvlib-specific functionality
diff --git a/docs/sphinx/source/whatsnew/v0.15.3.rst b/docs/sphinx/source/whatsnew/v0.15.3.rst
@@ -1,4 +1,4 @@
-﻿.. _whatsnew_0_15_3:
+.. _whatsnew_0_15_3:
 v0.15.3 (Anticipated September, 2026)
 -------------------------------------
 Breaking Changes
diff --git a/docs/sphinx/source/whatsnew/v0.7.0.rst b/docs/sphinx/source/whatsnew/v0.7.0.rst
@@ -1,4 +1,4 @@
-﻿.. _whatsnew_0700:
+.. _whatsnew_0700:
 
 v0.7.0 (December 18, 2019)
 --------------------------
@@ -224,7 +224,7 @@ Contributors
 * Oscar Dowson (:ghuser:`odow`)
 * Anton Driesse (:ghuser:`adriesse`)
 * Alexander Morgan (:ghuser:`alexandermorgan`)
-* Miguel Sánchez de León Peque (:ghuser:`Peque`)
+* Miguel S�nchez de Le�n Peque (:ghuser:`Peque`)
 * Tanguy Lunel (:ghuser:`tylunel`)
 * Veronica Guo (:ghuser:`veronicaguo`)
 * Joseph Ranalli (:ghuser:`jranalli`)
diff --git a/docs/tutorials/atmosphere.ipynb b/docs/tutorials/atmosphere.ipynb
@@ -50,7 +50,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')"
+    "tus = Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')"
    ]
   },
   {
@@ -67,7 +67,7 @@
       "  latitude: 32.2\n",
       "  longitude: -111\n",
       "  altitude: 700\n",
-      "  tz: US/Arizona\n"
+      "  tz: America/Phoenix\n"
      ]
     }
    ],
diff --git a/docs/tutorials/irradiance.ipynb b/docs/tutorials/irradiance.ipynb
@@ -392,7 +392,7 @@
     }
    ],
    "source": [
-    "tus = pvlib.location.Location(32.2, -111, 'US/Arizona', 700, 'Tucson')\n",
+    "tus = pvlib.location.Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')\n",
     "times = pd.date_range(start='2016-01-01', end='2016-01-02', freq='1min', tz=tus.tz)\n",
     "times_utc = times.tz_convert('UTC')\n",
     "ephem_data = tus.get_solarposition(times)\n",
diff --git a/docs/tutorials/pvsystem.ipynb b/docs/tutorials/pvsystem.ipynb
@@ -573,7 +573,7 @@
     "from pvlib import atmosphere\n",
     "from pvlib.location import Location\n",
     "\n",
-    "tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')\n",
+    "tus = Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')\n",
     "\n",
     "times_loc = pd.date_range(start=datetime.datetime(2014,4,1), end=datetime.datetime(2014,4,2), freq='30s', tz=tus.tz)\n",
     "solpos = pvlib.solarposition.get_solarposition(times_loc, tus.latitude, tus.longitude)\n",
diff --git a/docs/tutorials/solarposition.ipynb b/docs/tutorials/solarposition.ipynb
@@ -81,7 +81,7 @@
       "  latitude: 32.2\n",
       "  longitude: -111\n",
       "  altitude: 700\n",
-      "  tz: US/Arizona\n",
+      "  tz: America/Phoenix\n",
       "Location: \n",
       "  name: Golden\n",
       "  latitude: 39.742476\n",
@@ -104,11 +104,11 @@
     }
    ],
    "source": [
-    "tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')\n",
+    "tus = Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')\n",
     "print(tus)\n",
     "golden = Location(39.742476, -105.1786, 'America/Denver', 1830, 'Golden')\n",
     "print(golden)\n",
-    "golden_mst = Location(39.742476, -105.1786, 'MST', 1830, 'Golden MST')\n",
+    "golden_mst = Location(39.742476, -105.1786, 'America/Phoenix', 1830, 'Golden MST')\n",
     "print(golden_mst)\n",
     "berlin = Location(52.5167, 13.3833, 'Europe/Berlin', 34, 'Berlin')\n",
     "print(berlin)"
diff --git a/docs/tutorials/tracking.ipynb b/docs/tutorials/tracking.ipynb
@@ -91,7 +91,7 @@
       "  latitude: 32.2\n",
       "  longitude: -111\n",
       "  altitude: 700\n",
-      "  tz: US/Arizona\n",
+      "  tz: America/Phoenix\n",
       "Location: \n",
       "  name: Johannesburg\n",
       "  latitude: -26.2044\n",
@@ -102,7 +102,7 @@
     }
    ],
    "source": [
-    "tus = Location(32.2, -111, 'US/Arizona', 700, 'Tucson')\n",
+    "tus = Location(32.2, -111, 'America/Phoenix', 700, 'Tucson')\n",
     "print(tus)\n",
     "johannesburg = Location(-26.2044, 28.0456, 'Africa/Johannesburg', 1753, 'Johannesburg')\n",
     "print(johannesburg)"
@@ -2208,12 +2208,12 @@
       "  latitude: 35\n",
       "  longitude: -106\n",
       "  altitude: 0\n",
-      "  tz: US/Mountain\n"
+      "  tz: America/Denver\n"
      ]
     }
    ],
    "source": [
-    "abq = Location(35, -106, 'US/Mountain', 0, 'Albuquerque')\n",
+    "abq = Location(35, -106, 'America/Denver', 0, 'Albuquerque')\n",
     "print(abq)"
    ]
   },
diff --git a/fix_ashrae.py b/fix_ashrae.py
@@ -0,0 +1,38 @@
+﻿with open('pvlib/iam.py', 'r') as f:
+    content = f.read()
+
+old = '''    See Also
+    --------
+    pvlib.iam.physical
+    pvlib.iam.martin_ruiz
+    pvlib.iam.interp
+    """
+
+    iam = 1 - b * (1 / np.cos(np.radians(aoi)) - 1)'''
+
+new = '''    See Also
+    --------
+    pvlib.iam.physical
+    pvlib.iam.martin_ruiz
+    pvlib.iam.interp
+
+    Examples
+    --------
+    >>> import pvlib
+    >>> pvlib.iam.ashrae(aoi=20)
+    0.9967911113762044
+
+    >>> import numpy as np
+    >>> pvlib.iam.ashrae(aoi=np.array([0, 30, 50, 90]))
+    array([1.        , 0.99226497, 0.97221381, 0.        ])
+    """
+
+    iam = 1 - b * (1 / np.cos(np.radians(aoi)) - 1)'''
+
+if old in content:
+    content = content.replace(old, new)
+    with open('pvlib/iam.py', 'w') as f:
+        f.write(content)
+    print("SUCCESS - Examples section added")
+else:
+    print("ERROR - could not find the exact text to replace")
diff --git a/pvlib/fix_ashrae.py b/pvlib/fix_ashrae.py
@@ -0,0 +1,38 @@
+with open('pvlib/iam.py', 'r') as f:
+    content = f.read()
+
+old = '''    See Also
+    --------
+    pvlib.iam.physical
+    pvlib.iam.martin_ruiz
+    pvlib.iam.interp
+    """
+
+    iam = 1 - b * (1 / np.cos(np.radians(aoi)) - 1)'''
+
+new = '''    See Also
+    --------
+    pvlib.iam.physical
+    pvlib.iam.martin_ruiz
+    pvlib.iam.interp
+
+    Examples
+    --------
+    >>> import pvlib
+    >>> pvlib.iam.ashrae(aoi=20)
+    0.9967911113762044
+
+    >>> import numpy as np
+    >>> pvlib.iam.ashrae(aoi=np.array([0, 30, 50, 90]))
+    array([1.        , 0.99226497, 0.97221381, 0.        ])
+    """
+
+    iam = 1 - b * (1 / np.cos(np.radians(aoi)) - 1)'''
+
+if old in content:
+    content = content.replace(old, new)
+    with open('pvlib/iam.py', 'w') as f:
+        f.write(content)
+    print("SUCCESS - Examples section added")
+else:
+    print("ERROR - could not find the exact text to replace")
