Fix mypy errors

src/astral/__init__.py

@@ -51,7 +51,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 
 __all__ = [

src/astral/__main__.py

@@ -8,7 +8,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 options = argparse.ArgumentParser()
 options.add_argument(
@@ -54,20 +54,19 @@
 sun_as_str = {}
 format_str = "%Y-%m-%dT%H:%M:%S"
 if args.tzname is None:
-    tzinfo = datetime.timezone.utc
+    kwargs["tzinfo"] = datetime.timezone.utc
     format_str += "Z"
 else:
-    tzinfo = zoneinfo.ZoneInfo(loc.timezone)
+    kwargs["tzinfo"] = zoneinfo.ZoneInfo(loc.timezone)
     format_str += "%z"
 
-kwargs["tzinfo"] = tzinfo
 
 s = sun.sun(**kwargs)
 
 for key, value in s.items():
     sun_as_str[key] = s[key].strftime(format_str)
 
-sun_as_str["timezone"] = tzinfo.tzname
+sun_as_str["timezone"] = kwargs["tzinfo"].tzname
 sun_as_str["location"] = f"{loc.name}, {loc.region}"
 
 print(json.dumps(sun_as_str))

src/astral/julian.py

@@ -32,12 +32,12 @@ def _time_to_seconds(t: datetime.time) -> int:
     year = at.year
     month = at.month
     day = at.day
-    day_fraction = 0
+    day_fraction = 0.0
     if isinstance(at, datetime.datetime):
         t = _time_to_seconds(at.time())
         day_fraction = t / (24 * 60 * 60)
     else:
-        day_fraction = 0
+        day_fraction = 0.0
 
     if month <= 2:
         year -= 1
@@ -102,7 +102,7 @@ def julianday_to_datetime(jd: float) -> datetime.datetime:
     d = int(365.25 * c)
     e = int((b - d) / 30.6001)
 
-    d = b - d - int(30.6001 * e) + f
+    d = b - d - int(30.6001 * e) + f  # type: ignore
     day = int(d)
     t = d - day
     total_seconds = t * (24 * 60 * 60)

src/astral/location.py

@@ -4,7 +4,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 from typing import Any, Dict, Optional, Tuple, Union
 

src/astral/moon.py

@@ -15,7 +15,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 from astral import AstralBodyPosition, Observer, now, today
 from astral.julian import julianday, julianday_2000

src/astral/sun.py

@@ -5,7 +5,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 from astral import (
     Depression,
@@ -444,7 +444,7 @@ def noon(
         second,
         tzinfo=datetime.timezone.utc,
     )
-    return noon.astimezone(tzinfo)  # type: ignore pylint: disable=E1120
+    return noon.astimezone(tzinfo)  # type: ignore # pylint: disable=E1120
 
 
 def midnight(

src/docs/conf.py

@@ -26,7 +26,6 @@
 
 source_suffix = ".rst"
 master_doc = "index"
-exclude_trees = []
 
 pygments_style = "sphinx"
 

src/test/conftest.py

@@ -1,4 +1,4 @@
-import pytest
+import pytest  # type: ignore
 
 from astral import LocationInfo
 from astral.geocoder import LocationDatabase, database

src/test/moon/test_moon.py

@@ -1,13 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime
 
-import pytest
-
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
+import pytest  # type: ignore
 from almost_equal import datetime_almost_equal
 
 from astral import moon
@@ -107,8 +101,8 @@ def test_moonset_riyadh_utc(
 def test_moonrise_wellington(
     date_: datetime.date, risetime: datetime.datetime, wellington: Location
 ):
-    risetime = risetime.replace(tzinfo=wellington.tz)
-    calc_time = moon.moonrise(wellington.observer, date_, tzinfo=wellington.tz)
+    risetime = risetime.replace(tzinfo=wellington.tzinfo)
+    calc_time = moon.moonrise(wellington.observer, date_, tzinfo=wellington.tzinfo)
     assert calc_time is not None
     calc_time = calc_time.astimezone(wellington.tzinfo)
     assert datetime_almost_equal(calc_time, risetime, seconds=120)

src/test/moon/test_moon_azimuth.py

@@ -1,6 +1,6 @@
 import datetime
 
-import pytest
+import pytest  # type: ignore
 
 from astral import Observer
 from astral.location import Location

src/test/moon/test_moon_position.py

@@ -7,12 +7,12 @@ def test_moon_position():
     d = date(1969, 6, 28)
     jd = julianday(d)
     jd2000 = jd - 2451545  # Julian day relative to Jan 1.5, 2000
-    _pos1 = moon_position(jd2000)
+    moon_position(jd2000)
 
     d = date(1992, 4, 12)
     jd = julianday(d)
     jd2000 = jd - 2451545  # Julian day relative to Jan 1.5, 2000
-    _pos2 = moon_position(jd2000)
+    moon_position(jd2000)
     pass
 
 

src/test/test_Location.py

@@ -5,10 +5,10 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 import freezegun
-import pytest
+import pytest  # type: ignore
 from almost_equal import datetime_almost_equal
 
 from astral import LocationInfo
@@ -57,13 +57,13 @@ def test_Info(self, london: Location, london_info: LocationInfo):
 
     def test_Sun(self, london: Location):
         """Test Location's version of the sun calculation"""
-        ldt = datetime.datetime(2015, 8, 1, 5, 23, 20, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 8, 1, 5, 23, 20, tzinfo=london.tzinfo)
         sunrise = london.sun(datetime.date(2015, 8, 1))["sunrise"]
         assert datetime_almost_equal(sunrise, ldt)
 
     def test_Dawn(self, london: Location):
         """Test Location returns dawn times in the local timezone"""
-        ldt = datetime.datetime(2015, 8, 1, 4, 41, 44, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 8, 1, 4, 41, 44, tzinfo=london.tzinfo)
         dawn = london.dawn(datetime.date(2015, 8, 1))
         assert datetime_almost_equal(dawn, ldt)
         # assert dawn.tzinfo.zone == london.tzinfo.zone
@@ -76,7 +76,7 @@ def test_DawnUTC(self, london: Location):
         # assert dawn.tzinfo.zone == datetime.timezone.utc.zone
 
     def test_Sunrise(self, london: Location):
-        ldt = datetime.datetime(2015, 8, 1, 5, 23, 20, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 8, 1, 5, 23, 20, tzinfo=london.tzinfo)
         sunrise = london.sunrise(datetime.date(2015, 8, 1))
         assert datetime_almost_equal(sunrise, ldt)
         # assert sunrise.tzinfo.zone == london.tzinfo.zone
@@ -88,7 +88,7 @@ def test_SunriseUTC(self, london: Location):
         # assert sunrise.tzinfo.zone == datetime.timezone.utc.zone
 
     def test_SolarNoon(self, london: Location):
-        ldt = datetime.datetime(2015, 8, 1, 13, 6, 53, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 8, 1, 13, 6, 53, tzinfo=london.tzinfo)
         noon = london.noon(datetime.date(2015, 8, 1))
         assert datetime_almost_equal(noon, ldt)
         # assert noon.tzinfo.zone == london.tzinfo.zone
@@ -100,7 +100,7 @@ def test_SolarNoonUTC(self, london: Location):
         # assert noon.tzinfo.zone == datetime.timezone.utc.zone
 
     def test_Dusk(self, london: Location):
-        ldt = datetime.datetime(2015, 12, 1, 16, 35, 11, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 12, 1, 16, 35, 11, tzinfo=london.tzinfo)
         dusk = london.dusk(datetime.date(2015, 12, 1))
         assert datetime_almost_equal(dusk, ldt)
         # assert dusk.tzinfo.zone == london.tzinfo.zone
@@ -112,7 +112,7 @@ def test_DuskUTC(self, london: Location):
         # assert dusk.tzinfo.zone == datetime.timezone.utc.zone
 
     def test_Sunset(self, london: Location):
-        ldt = datetime.datetime(2015, 12, 1, 15, 55, 29, tzinfo=london.tz)
+        ldt = datetime.datetime(2015, 12, 1, 15, 55, 29, tzinfo=london.tzinfo)
         sunset = london.sunset(datetime.date(2015, 12, 1))
         assert datetime_almost_equal(sunset, ldt)
         # assert sunset.tzinfo.zone == london.tzinfo.zone
@@ -124,20 +124,20 @@ def test_SunsetUTC(self, london: Location):
         # assert sunset.tzinfo.zone == datetime.timezone.utc.zone
 
     def test_SolarElevation(self, riyadh: Location):
-        dt = datetime.datetime(2015, 12, 14, 8, 0, 0, tzinfo=riyadh.tz)
+        dt = datetime.datetime(2015, 12, 14, 8, 0, 0, tzinfo=riyadh.tzinfo)
         elevation = riyadh.solar_elevation(dt)
         assert abs(elevation - 17) < 0.5
 
     def test_SolarAzimuth(self, riyadh: Location):
-        dt = datetime.datetime(2015, 12, 14, 8, 0, 0, tzinfo=riyadh.tz)
+        dt = datetime.datetime(2015, 12, 14, 8, 0, 0, tzinfo=riyadh.tzinfo)
         azimuth = riyadh.solar_azimuth(dt)
         assert abs(azimuth - 126) < 0.5
 
     def test_TimeAtAltitude(self, new_delhi: Location):
         test_data = {datetime.date(2016, 1, 5): datetime.datetime(2016, 1, 5, 10, 0)}
 
         for day, cdt in test_data.items():
-            cdt = cdt.replace(tzinfo=new_delhi.tz)
+            cdt = cdt.replace(tzinfo=new_delhi.tzinfo)
             dt = new_delhi.time_at_elevation(28, day)
             assert datetime_almost_equal(dt, cdt, seconds=600)
 

src/test/test_Repr.py

@@ -5,15 +5,29 @@
 
 class TestLocationRepr:
     def test_default(self):
-        l = Location()
+        location = Location()
         assert (
-            l.__repr__() == "Greenwich/England, tz=Europe/London, lat=51.47, lon=-0.00"
+            location.__repr__()
+            == "Greenwich/England, tz=Europe/London, lat=51.47, lon=-0.00"
         )
 
     def test_full(self):
-        l = Location(LocationInfo("London", "England", "Europe/London", 51.68, -0.05))
-        assert l.__repr__() == "London/England, tz=Europe/London, lat=51.68, lon=-0.05"
+        location = Location(
+            LocationInfo("London", "England", "Europe/London", 51.68, -0.05)
+        )
+        assert (
+            location.__repr__()
+            == "London/England, tz=Europe/London, lat=51.68, lon=-0.05"
+        )
 
     def test_no_region(self):
-        l = Location(LocationInfo("London", None, "Europe/London", 51.68, -0.05))
-        assert l.__repr__() == "London, tz=Europe/London, lat=51.68, lon=-0.05"
+        location = Location(
+            LocationInfo(
+                "London",
+                None,
+                "Europe/London",
+                51.68,
+                -0.05,
+            )
+        )
+        assert location.__repr__() == ("London, tz=Europe/London, lat=51.68, lon=-0.05")

src/test/test_depression_not_reached.py

@@ -2,7 +2,7 @@
 
 import datetime
 
-import pytest
+import pytest  # type: ignore
 
 from astral import LocationInfo
 from astral.location import Location

src/test/test_geocoder.py

@@ -5,7 +5,7 @@
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 from pytest import approx, raises  # type: ignore
 

src/test/test_julian.py

@@ -1,3 +1,4 @@
+# type: ignore
 import datetime
 from typing import Union
 

src/test/test_location_info.py

@@ -1,11 +1,12 @@
+# type: ignore
 import pytest
 
 from astral import LocationInfo
 
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 
 class TestLocationInfo:

src/test/test_misc.py

@@ -1,9 +1,10 @@
+# type: ignore
 from datetime import timedelta
 
 try:
     import zoneinfo
 except ImportError:
-    from backports import zoneinfo
+    from backports import zoneinfo  # type: ignore
 
 import freezegun
 from pytest import approx, raises

src/test/test_norway.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta, timezone
 
-import pytest
+import pytest  # type: ignore
 
 import astral
 from astral import sun

src/test/test_observer.py

@@ -1,3 +1,4 @@
+# type: ignore
 import pytest
 
 from astral import Observer