pylunar 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

pylunar/lunar_feature_container.py

@@ -81,7 +81,7 @@ class LunarFeatureContainer:
             self.features = collections.OrderedDict()
 
         cur = self.conn.cursor()
-        sql = f'select * from Features where Lunar_Code = "{self.club_name}" or ' 'Lunar_Code = "Both"'
+        sql = f'select * from Features where Lunar_Code = "{self.club_name}" or Lunar_Code = "Both"'
         if limit is not None:
             sql += f" limit {limit}"
         cur.execute(sql)

pylunar/moon_info.py

@@ -14,13 +14,13 @@ from __future__ import annotations
 
 __all__ = ["MoonInfo"]
 
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 import math
 from operator import itemgetter
+import zoneinfo
 
 import ephem
-import pytz
 
 from .helpers import mjd_to_date_tuple, tuple_to_string
 from .lunar_feature import LunarFeature
@@ -495,13 +495,13 @@ class MoonInfo:
         """
         return math.degrees(self.moon.ra)
 
-    def rise_set_times(self, timezone: str) -> MoonPhases:
+    def rise_set_times(self, timezone_name: str) -> MoonPhases:
         """Calculate the rise, set and transit times in the local time system.
 
         Parameters
         ----------
-        timezone : str
-            The timezone identifier for the calculations.
+        timezone_name : str
+            The timezone_name identifier for the calculations.
 
         Returns
         -------
@@ -509,11 +509,11 @@ class MoonInfo:
             Set of rise, set, and transit times in the local time system. If
             event does not happen, 'Does not xxx' is tuple value.
         """
-        utc = pytz.utc
+        tz: zoneinfo.ZoneInfo | timezone
         try:
-            tz = pytz.timezone(timezone)
-        except pytz.UnknownTimeZoneError:
-            tz = utc
+            tz = zoneinfo.ZoneInfo(timezone_name)
+        except zoneinfo.ZoneInfoNotFoundError:
+            tz = timezone.utc
 
         func_map = {"rise": "rising", "transit": "transit", "set": "setting"}
 
@@ -524,20 +524,22 @@ class MoonInfo:
         self.observer.pressure = 0
         self.observer.horizon = "-0:34"
 
-        current_date_utc = datetime(*mjd_to_date_tuple(self.observer.date, round_off=True), tzinfo=utc)  # type: ignore
+        current_date_utc = datetime(
+            *mjd_to_date_tuple(self.observer.date, round_off=True), tzinfo=timezone.utc
+        )  # type: ignore
         current_date = current_date_utc.astimezone(tz)
         current_day = current_date.day
         times = {}
         does_not = None
         for time_type in ("rise", "transit", "set"):
             mjd_time = getattr(self.observer, "{}_{}".format("next", func_map[time_type]))(self.moon)
-            utc_time = datetime(*mjd_to_date_tuple(mjd_time, round_off=True), tzinfo=utc)  # type: ignore
+            utc_time = datetime(*mjd_to_date_tuple(mjd_time, round_off=True), tzinfo=timezone.utc)  # type: ignore
             local_date = utc_time.astimezone(tz)
             if local_date.day == current_day:
                 times[time_type] = local_date
             else:
                 mjd_time = getattr(self.observer, "{}_{}".format("previous", func_map[time_type]))(self.moon)
-                utc_time = datetime(*mjd_to_date_tuple(mjd_time, round_off=True), tzinfo=utc)  # type: ignore
+                utc_time = datetime(*mjd_to_date_tuple(mjd_time, round_off=True), tzinfo=timezone.utc)  # type: ignore
                 local_date = utc_time.astimezone(tz)
                 if local_date.day == current_day:
                     times[time_type] = local_date

{pylunar-0.9.0.dist-info → pylunar-0.10.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pylunar
-Version: 0.9.0
+Version: 0.10.0
 Summary: Information for completing the Astronomical League's Lunar and Lunar II observing programs.
 Author-email: Michael Reuter <mareuternh@gmail.com>
+License-Expression: BSD-3-Clause
 Project-URL: Documentation, http://pylunar.readthedocs.io
 Project-URL: Repository, https://github.com/mareuter/pylunar
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -18,25 +18,26 @@ Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: ephem==4.1.6
-Requires-Dist: importlib-resources==6.4.5; python_version < "3.10"
-Requires-Dist: typing-extensions==4.12.2; python_version < "3.10"
-Requires-Dist: pytz==2024.2
+Requires-Dist: ephem==4.2
+Requires-Dist: importlib-resources==6.5.2; python_version < "3.10"
+Requires-Dist: typing-extensions==4.13.2; python_version < "3.10"
 Provides-Extra: dev
 Requires-Dist: pylunar[build,docs,lint,test]; extra == "dev"
-Requires-Dist: scriv==1.5.1; extra == "dev"
-Requires-Dist: tox==4.23.2; extra == "dev"
+Requires-Dist: scriv==1.6.2; extra == "dev"
+Requires-Dist: tox==4.25.0; extra == "dev"
 Provides-Extra: test
-Requires-Dist: coverage[toml]==7.6.9; extra == "test"
-Requires-Dist: pytest==8.3.3; extra == "test"
+Requires-Dist: coverage[toml]==7.8.0; extra == "test"
+Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: lint
-Requires-Dist: pre-commit==4.0.1; extra == "lint"
+Requires-Dist: pre-commit==4.2.0; extra == "lint"
 Provides-Extra: build
 Requires-Dist: build==1.2.2.post1; extra == "build"
-Requires-Dist: twine==5.1.1; extra == "build"
+Requires-Dist: twine==6.1.0; extra == "build"
 Provides-Extra: docs
-Requires-Dist: sphinx~=7.1; extra == "docs"
+Requires-Dist: sphinx~=7.4; python_version < "3.11" and extra == "docs"
+Requires-Dist: sphinx~=8.2; python_version >= "3.11" and extra == "docs"
 Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
+Dynamic: license-file
 
 =============================
 Python Lunar

pylunar-0.10.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+pylunar/__init__.py,sha256=1HgvGZdShUOeanMLMf2vNzdtyvcyAGtjvsytGxbaW00,1116
+pylunar/altitude_dict.py,sha256=x0nsR9ZeyyEl10tvSDXSqfUx_4q2hmwckWzEmpjoE7Q,1558
+pylunar/helpers.py,sha256=UgEFvBGGZxTBaKx16-CjOO8hkqPA_GLRZN8SOgshZFs,1327
+pylunar/lunar_feature.py,sha256=cqNFA7ED-u13H1rayo029GrQfPR3g1cYL-m_Q0zYNuQ,5532
+pylunar/lunar_feature_container.py,sha256=RuDFrjjsE5tKZ41YmMORggobWIc8qdCpjYaIjE7cb3o,2816
+pylunar/moon_info.py,sha256=DttqChvhltmDCGlurNc-eqWVROYlRU4Aj86rgkGn1jg,20952
+pylunar/pkg_types.py,sha256=o5LVdgosUo9Vy6OS2Hi1HkVcgUStlPV-AnEYimyxlIo,972
+pylunar/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pylunar/data/lunar.db,sha256=y2u5wR_DpHjPYH7fuR-T_q0nbPzN1GuP8_OXorjVr14,28672
+pylunar-0.10.0.dist-info/licenses/AUTHORS.rst,sha256=mqGQzrJPFGm44DZxZFs0d080QDWXdtfFlv1i_fdJerg,332
+pylunar-0.10.0.dist-info/licenses/LICENSE,sha256=Zwd1CheD0-t0GamZx7hdZaYt3ETG8ox6kVcN9AIZd0A,1479
+pylunar-0.10.0.dist-info/METADATA,sha256=7ES6T3Jr4m9WtjkR_EhIxAsUBUMblpJfuvp6ECoca2g,3140
+pylunar-0.10.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+pylunar-0.10.0.dist-info/top_level.txt,sha256=vEQZCgYlUuoq6D4q99Kj5fSpNs2Mo-jW8vKV3dnpI-U,8
+pylunar-0.10.0.dist-info/RECORD,,

{pylunar-0.9.0.dist-info → pylunar-0.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{pylunar-0.9.0.dist-info → pylunar-0.10.0.dist-info/licenses}/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016-2024 Michael Reuter
+Copyright 2016-2025 Michael Reuter
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

pylunar-0.9.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-pylunar/__init__.py,sha256=1HgvGZdShUOeanMLMf2vNzdtyvcyAGtjvsytGxbaW00,1116
-pylunar/altitude_dict.py,sha256=x0nsR9ZeyyEl10tvSDXSqfUx_4q2hmwckWzEmpjoE7Q,1558
-pylunar/helpers.py,sha256=UgEFvBGGZxTBaKx16-CjOO8hkqPA_GLRZN8SOgshZFs,1327
-pylunar/lunar_feature.py,sha256=cqNFA7ED-u13H1rayo029GrQfPR3g1cYL-m_Q0zYNuQ,5532
-pylunar/lunar_feature_container.py,sha256=ci5MXPLqKhghh3k9HCti5csvkohfu3GV9LHnI6rLio0,2819
-pylunar/moon_info.py,sha256=n9sMgk8lDM18_D6hbC8AG0I9yQ7-FfwwQccah-LrqCs,20833
-pylunar/pkg_types.py,sha256=o5LVdgosUo9Vy6OS2Hi1HkVcgUStlPV-AnEYimyxlIo,972
-pylunar/data/lunar.db,sha256=y2u5wR_DpHjPYH7fuR-T_q0nbPzN1GuP8_OXorjVr14,28672
-pylunar-0.9.0.dist-info/AUTHORS.rst,sha256=mqGQzrJPFGm44DZxZFs0d080QDWXdtfFlv1i_fdJerg,332
-pylunar-0.9.0.dist-info/LICENSE,sha256=EF_CKfNhkKjEynpn9Msb6HaGNIBN9VfeGyrJFJQ5FYk,1479
-pylunar-0.9.0.dist-info/METADATA,sha256=2QqOXzrBsu6onsZzuMbM3ePz8PJZGaGg-JzO_OzEKIo,3064
-pylunar-0.9.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pylunar-0.9.0.dist-info/top_level.txt,sha256=vEQZCgYlUuoq6D4q99Kj5fSpNs2Mo-jW8vKV3dnpI-U,8
-pylunar-0.9.0.dist-info/RECORD,,