convertdate 2.4.0__tar.gz → 2.5.0__tar.gz

{convertdate-2.4.0/src/convertdate.egg-info → convertdate-2.5.0}/PKG-INFO

@@ -1,29 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: convertdate
-Version: 2.4.0
+Version: 2.5.0
 Summary: Converts between Gregorian dates and other calendar systems
-Home-page: https://github.com/fitnr/convertdate
-Author: Neil Freeman
-Author-email: contact@fakeisthenewreal.org
-License: MIT
+Author: Phil Schwartz
+Author-email: Neil Freeman <contact@fakeisthenewreal.org>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/fitnr/convertdate
 Keywords: calendar,date,time
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Religion
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Operating System :: OS Independent
 Requires-Python: <4,>=3.7
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pymeeus<=1,>=0.3.13
 Provides-Extra: tests
+Requires-Dist: coverage[toml]; extra == "tests"
+Requires-Dist: pylint; extra == "tests"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: myst_parser; extra == "docs"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: build; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Dynamic: license-file
 
 convertdate
 ===========
@@ -275,5 +285,3 @@ Other utility functions:
 -   previous\_weekday
 -   previous\_or\_current\_weekday
 
-
-

convertdate-2.5.0/pyproject.toml

@@ -0,0 +1,96 @@
+# This file is part of convertdate.
+# http://github.com/fitnr/convertdate
+# Licensed under the MIT license:
+# http://opensource.org/licenses/MIT
+# Copyright (c) 2020-2, fitnr <fitnr@fakeisthenewreal>
+[project]
+name = "convertdate"
+description = "Converts between Gregorian dates and other calendar systems"
+authors = [
+    {name = "Neil Freeman", email = "contact@fakeisthenewreal.org"},
+    {name = "Phil Schwartz"}
+    ]
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+keywords = ["calendar", "date", "time"]
+classifiers = [
+    "Natural Language :: English",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Religion",
+    "Topic :: Scientific/Engineering :: Astronomy",
+    "Operating System :: OS Independent",
+    ]
+requires-python = ">= 3.7, <4"
+dependencies = [
+    "pymeeus>=0.3.13, <=1",
+    ]
+dynamic = ["version"]
+
+[tool.setuptools.dynamic]
+version = { attr = "convertdate.__version__" }
+
+[project.urls]
+Homepage = "https://github.com/fitnr/convertdate"
+
+[project.optional-dependencies]
+tests = [
+    "coverage[toml]",
+    "pylint",
+    ]
+docs = [
+    "sphinx",
+    "sphinx_rtd_theme",
+    "myst_parser",
+    ]
+dev = [
+    "build",
+    "black",
+    "isort",
+    ]
+
+[build-system]
+requires = ["setuptools>=61.1.1", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+zip-safe = true
+packages = [
+    "convertdate",
+    "convertdate.data",
+]
+package-dir = {"" = "src"}
+
+[tool.black]
+line-length = 120
+target-version = ["py39"]
+include = "py$"
+skip-string-normalization = true
+
+[tool.pylint.master]
+fail-under = "8.77"
+
+[tool.pylint.messages_control]
+disable = [
+    "invalid-name",
+    "duplicate-code"
+]
+
+[tool.pylint.format]
+max-line-length = 120
+
+[tool.isort]
+line_length = 120
+
+[tool.ruff]
+target-version = "py39"
+line-length = 120
+
+[tool.ruff.lint]
+select = ["I", "E"]

convertdate-2.5.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/__init__.py

@@ -18,47 +18,48 @@ which was developed by John Walker.
 The algorithms are believed to be derived from: Meeus, Jean. `Astronomical Algorithms`,
 Richmond: Willmann-Bell, 1991 (ISBN 0-943396-35-2)
 """
-from . import armenian
-from . import bahai
-from . import coptic
-from . import daycount
-from . import dublin
-from . import french_republican
-from . import gregorian
-from . import hebrew
-from . import holidays
-from . import indian_civil
-from . import iso
-from . import islamic
-from . import julian
-from . import julianday
-from . import mayan
-from . import persian
-from . import positivist
-from . import ordinal
-from . import utils
+from . import (
+    armenian,
+    bahai,
+    coptic,
+    daycount,
+    dublin,
+    french_republican,
+    gregorian,
+    hebrew,
+    holidays,
+    indian_civil,
+    islamic,
+    iso,
+    julian,
+    julianday,
+    mayan,
+    ordinal,
+    persian,
+    positivist,
+    utils,
+)
 
-__version__ = '2.4.0'
+__version__ = '2.5.0'
 
 __all__ = [
-    'holidays',
     'armenian',
     'bahai',
     'coptic',
-    'dublin',
     'daycount',
+    'dublin',
     'french_republican',
     'gregorian',
     'hebrew',
+    'holidays',
     'indian_civil',
     'islamic',
     'iso',
     'julian',
     'julianday',
     'mayan',
+    'ordinal',
     'persian',
     'positivist',
-    'mayan',
-    'ordinal',
     'utils',
 ]

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/coptic.py

@@ -13,6 +13,7 @@ of the ancient Egyptian calendar.
 It consists of twelve months of 30 days, followed by a "little month" of five days
 (six in leap years).
 """
+
 from math import floor
 
 from . import gregorian
@@ -49,8 +50,7 @@ def to_jd(year, month, day):
 
 def from_jd(jdc):
     "Create a new date from a Julian date."
-    cdc = floor(jdc) + 0.5 - EPOCH
-    year = floor((cdc - floor((cdc + 366) / 1461)) / 365) + 1
+    year = floor((4 * floor(jdc - EPOCH) + 1463) / 1461)
 
     yday = jdc - to_jd(year, 1, 1)
 

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/hebrew.py

@@ -4,6 +4,7 @@
 # Licensed under the MIT license:
 # http://opensource.org/licenses/MIT
 # Copyright (c) 2016, fitnr <fitnr@fakeisthenewreal>
+import warnings
 from math import floor
 
 from . import gregorian
@@ -108,7 +109,8 @@ def year_days(year):
     return to_jd(year + 1, 7, 1) - to_jd(year, 7, 1)
 
 
-def month_days(year, month):
+
+def month_length(year, month):
     '''How many days are in a given month of a given year'''
     if month > VEADAR:
         raise ValueError("Incorrect month index")
@@ -132,6 +134,12 @@ def month_days(year, month):
     # Nope, it's a 30 day month
     return 30
 
+def month_days(year, month):
+    # retain for backwards compatibility, but warn that this is deprecated
+    warnings.warn("month_days is deprecated, please use month_length",
+        DeprecationWarning, stacklevel=2)
+    return month_length(year, month)
+
 
 def to_jd(year, month, day):
     months = year_months(year)

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/islamic.py

@@ -16,9 +16,9 @@ MONTHS = [
     "al-Muḥarram",
     "Ṣafar",
     "Rabīʿ al-ʾAwwal",
-    "Rabīʿ ath-Thānī,",
-    "Jumādā al-ʾAwwal,",
-    "Jumādā ath-Thāniyah,",
+    "Rabīʿ ath-Thānī",
+    "Jumādā al-ʾAwwal",
+    "Jumādā ath-Thāniyah",
     "Rajab",
     "Shaʿbān",
     "Ramaḍān",

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/mayan.py

@@ -288,7 +288,9 @@ def next_tzolkin(tzolkin, jd):
 
 
 def next_tzolkin_haab(tzolkin, haab, jd):
-    '''For a given haab-tzolk'in combination, and a Julian day count, find the next occurrance of the combination after the date'''
+    '''Find the next occurence of a haab-tzolk'in combination.
+
+    Requires a Julian day count as the starting place for the search.'''
     # get H & T of input jd, and their place in the 18,980 day cycle
     haabcount = _haab_count(*to_haab(jd))
     haab_desired_count = _haab_count(*haab)

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/ordinal.py

@@ -22,9 +22,16 @@ def to_jd(year, dayofyear):
 
 
 def from_jd(jd):
-    '''Convert a Julian day count to an ordinal date.'''
-    year, _, _ = gregorian.from_jd(jd)
-    return year, round(jd - gregorian.to_jd(year, 1, 1) + 1)
+    '''Convert a Julian day count to an ordinal date.
+
+    The day of year is derived from the Gregorian date rather than the raw
+    ``jd``. Both ``to_jd`` values carry the same half-day offset, so their
+    difference is an exact whole number of days; subtracting ``jd`` directly
+    leaves a ``.5`` remainder that ``round`` pushes the wrong way (e.g.
+    ``365.5`` -> ``366``), reporting a non-existent day 366 in common years.
+    '''
+    year, month, day = gregorian.from_jd(jd)
+    return year, int(gregorian.to_jd(year, month, day) - gregorian.to_jd(year, 1, 1)) + 1
 
 
 def from_gregorian(year, month, day):

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate/utils.py

@@ -74,14 +74,12 @@ def n_weeks(weekday, jd, nthweek):
 
 
 def monthcalendarhelper(start_weekday, month_length):
-    end_weekday = start_weekday + (month_length - 1) % 7
 
     lpad = (start_weekday + 1) % 7
-    rpad = (5 - end_weekday % 7) % 6
 
-    days = [None] * lpad + list(range(1, 1 + month_length)) + rpad * [None]
+    days = [None] * lpad + list(range(1, 1 + month_length)) + 7 * [None]
 
-    return [days[i : i + 7] for i in range(0, len(days), 7)]
+    return [days[i : i + 7] for i in range(0, lpad + month_length, 7)]
 
 
 def nth_day_of_month(n, weekday, month, year):

{convertdate-2.4.0 → convertdate-2.5.0/src/convertdate.egg-info}/PKG-INFO

@@ -1,29 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: convertdate
-Version: 2.4.0
+Version: 2.5.0
 Summary: Converts between Gregorian dates and other calendar systems
-Home-page: https://github.com/fitnr/convertdate
-Author: Neil Freeman
-Author-email: contact@fakeisthenewreal.org
-License: MIT
+Author: Phil Schwartz
+Author-email: Neil Freeman <contact@fakeisthenewreal.org>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/fitnr/convertdate
 Keywords: calendar,date,time
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Religion
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Operating System :: OS Independent
 Requires-Python: <4,>=3.7
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pymeeus<=1,>=0.3.13
 Provides-Extra: tests
+Requires-Dist: coverage[toml]; extra == "tests"
+Requires-Dist: pylint; extra == "tests"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: myst_parser; extra == "docs"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: build; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Dynamic: license-file
 
 convertdate
 ===========
@@ -275,5 +285,3 @@ Other utility functions:
 -   previous\_weekday
 -   previous\_or\_current\_weekday
 
-
-

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.cfg
-setup.py
 src/convertdate/__init__.py
 src/convertdate/armenian.py
 src/convertdate/bahai.py
@@ -26,10 +24,23 @@ src/convertdate/utils.py
 src/convertdate.egg-info/PKG-INFO
 src/convertdate.egg-info/SOURCES.txt
 src/convertdate.egg-info/dependency_links.txt
-src/convertdate.egg-info/entry_points.txt
 src/convertdate.egg-info/requires.txt
 src/convertdate.egg-info/top_level.txt
 src/convertdate.egg-info/zip-safe
 src/convertdate/data/__init__.py
 src/convertdate/data/french_republican_days.py
-src/convertdate/data/positivist.py
+src/convertdate/data/positivist.py
+tests/test_armenian.py
+tests/test_bahai.py
+tests/test_coptic.py
+tests/test_french_republican.py
+tests/test_general.py
+tests/test_gregorian.py
+tests/test_holidays.py
+tests/test_indian_civil.py
+tests/test_julian.py
+tests/test_mayan.py
+tests/test_ordinal.py
+tests/test_persian.py
+tests/test_positivist.py
+tests/test_utils.py

{convertdate-2.4.0 → convertdate-2.5.0}/src/convertdate.egg-info/requires.txt

@@ -4,7 +4,6 @@ pymeeus<=1,>=0.3.13
 build
 black
 isort
-pylint
 
 [docs]
 sphinx
@@ -12,4 +11,5 @@ sphinx_rtd_theme
 myst_parser
 
 [tests]
-coverage
+coverage[toml]
+pylint

convertdate-2.5.0/tests/test_armenian.py

@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+import time
+import unittest
+
+from convertdate import julianday
+from convertdate.armenian import (
+    _valid_date,
+    from_gregorian,
+    from_jd,
+    from_julian,
+    leap,
+    month_length,
+    to_gregorian,
+    to_jd,
+    to_julian,
+    tostring,
+)
+
+from . import CalTestCase
+
+
+class TestArmenian(CalTestCase):
+    def setUp(self):
+        self.now = time.localtime()
+        self.today = julianday.from_gregorian(self.now[0], self.now[1], self.now[2])
+
+    def testValidDate(self):
+        self.assertTrue(_valid_date(1, 1, 1))
+
+        self.assertTrue(_valid_date(533, 1, 1, method="sarkawag"))
+
+        with self.assertRaises(ValueError):
+            _valid_date(401, 1, 1, method="sarkawag")
+
+        with self.assertRaises(ValueError):
+            _valid_date(30, 4, 31)
+
+        with self.assertRaises(ValueError):
+            _valid_date(536, 13, 6)
+
+        with self.assertRaises(ValueError):
+            from_jd(1.5)
+
+        self.assertTrue(_valid_date(536, 13, 6, method="sarkawag"))
+
+    def testReflexive(self):
+        self.assertEqual(self.today, to_jd(*from_jd(self.today)))
+        self.assertEqual(self.today, to_jd(*from_jd(self.today, "sarkawag"), method="sarkawag"))
+        for jd in range(2159677, 2488395, 2000):
+            jd = jd + 0.5
+            self.assertEqual(jd, to_jd(*from_jd(jd)))
+            self.assertEqual(jd, to_jd(*from_jd(jd, "sarkawag"), method="sarkawag"))
+
+    def testLeap(self):
+        self.assertEqual(True, leap(600))
+        self.assertEqual(False, leap(601))
+
+    def testGregorian(self):
+        self.assertEqual((2019, 11, 3), to_gregorian(1469, 4, 14))
+        self.assertEqual((1469, 4, 14), from_gregorian(2019, 11, 3))
+
+    def testMonthLength(self):
+        self.assertEqual(30, month_length(600, 1))
+        self.assertEqual(5, month_length(600, 13))
+        self.assertEqual(6, month_length(600, 13, "sarkawag"))
+
+    def testJulian(self):
+        cases = [
+            # first date of the calendar
+            [(1, 1, 1), (552, 7, 11)],
+            # last day of the year
+            [(1, 13, 5), (553, 7, 10)],
+            # leap year moves the calendar
+            [(4, 13, 5), (556, 7, 9)],
+            [(5, 1, 1), (556, 7, 10)],
+            # check month boundaries for an entire year
+            [(420, 1, 1), (971, 3, 29)],
+            [(420, 1, 30), (971, 4, 27)],
+            [(420, 2, 1), (971, 4, 28)],
+            [(420, 2, 30), (971, 5, 27)],
+            [(420, 3, 1), (971, 5, 28)],
+            [(420, 3, 30), (971, 6, 26)],
+            [(420, 4, 1), (971, 6, 27)],
+            [(420, 4, 30), (971, 7, 26)],
+            [(420, 5, 1), (971, 7, 27)],
+            [(420, 5, 30), (971, 8, 25)],
+            [(420, 6, 1), (971, 8, 26)],
+            [(420, 6, 30), (971, 9, 24)],
+            [(420, 7, 1), (971, 9, 25)],
+            [(420, 7, 30), (971, 10, 24)],
+            [(420, 8, 1), (971, 10, 25)],
+            [(420, 8, 30), (971, 11, 23)],
+            [(420, 9, 1), (971, 11, 24)],
+            [(420, 9, 30), (971, 12, 23)],
+            [(420, 10, 1), (971, 12, 24)],
+            [(420, 10, 30), (972, 1, 22)],
+            [(420, 11, 1), (972, 1, 23)],
+            [(420, 11, 30), (972, 2, 21)],
+            [(420, 12, 1), (972, 2, 22)],
+            [(420, 12, 30), (972, 3, 22)],
+            [(420, 13, 1), (972, 3, 23)],
+            [(420, 13, 5), (972, 3, 27)],
+            # check month boundaries around Julian leap year
+            [(512, 13, 1), (1064, 2, 29)],
+            [(512, 13, 2), (1064, 3, 1)],
+            [(513, 1, 1), (1064, 3, 5)],
+            # check the two calendars in 1084
+            [(533, 6, 15), (1084, 8, 11)],
+        ]
+
+        for a, j in cases:
+            self.assertEqual(a, from_julian(*j))
+
+        for a, j in cases:
+            self.assertEqual(j, to_julian(*a))
+
+        self.assertEqual((533, 1, 1), from_julian(1084, 8, 11, method="sarkawag"))
+        self.assertEqual((533, 13, 5), from_julian(1085, 8, 10, method="sarkawag"))
+        self.assertEqual((536, 13, 6), from_julian(1088, 8, 10, method="sarkawag"))
+        self.assertEqual((537, 1, 1), from_julian(1088, 8, 11, method="sarkawag"))
+
+    def testTostring(self):
+        self.assertEqual('14 trē 1469', tostring(1469, 4, 14))