convertdate 2.4.1__tar.gz → 2.5.0__tar.gz

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

@@ -1,34 +1,12 @@
 Metadata-Version: 2.4
 Name: convertdate
-Version: 2.4.1
+Version: 2.5.0
 Summary: Converts between Gregorian dates and other calendar systems
+Author: Phil Schwartz
 Author-email: Neil Freeman <contact@fakeisthenewreal.org>
-License: The MIT License (MIT)
-        
-        Copyright (c) 2014-2022 Neil Freeman
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-        
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/fitnr/convertdate
 Keywords: calendar,date,time
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8

{convertdate-2.4.1 → convertdate-2.5.0}/pyproject.toml

@@ -7,13 +7,14 @@
 name = "convertdate"
 description = "Converts between Gregorian dates and other calendar systems"
 authors = [
-    {name = "Neil Freeman", email = "contact@fakeisthenewreal.org"}
+    {name = "Neil Freeman", email = "contact@fakeisthenewreal.org"},
+    {name = "Phil Schwartz"}
     ]
 readme = "README.md"
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"]
 keywords = ["calendar", "date", "time"]
 classifiers = [
-    "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.8",

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

@@ -40,7 +40,7 @@ from . import (
     utils,
 )
 
-__version__ = '2.4.1'
+__version__ = '2.5.0'
 
 __all__ = [
     'armenian',

{convertdate-2.4.1 → 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.1 → 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.1 → convertdate-2.5.0/src/convertdate.egg-info}/PKG-INFO

@@ -1,34 +1,12 @@
 Metadata-Version: 2.4
 Name: convertdate
-Version: 2.4.1
+Version: 2.5.0
 Summary: Converts between Gregorian dates and other calendar systems
+Author: Phil Schwartz
 Author-email: Neil Freeman <contact@fakeisthenewreal.org>
-License: The MIT License (MIT)
-        
-        Copyright (c) 2014-2022 Neil Freeman
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-        
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/fitnr/convertdate
 Keywords: calendar,date,time
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8

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

@@ -32,6 +32,7 @@ src/convertdate/data/french_republican_days.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

convertdate-2.5.0/tests/test_coptic.py

@@ -0,0 +1,68 @@
+from convertdate import coptic
+
+from . import CalTestCase
+
+
+class TestGregorian(CalTestCase):
+    def setUp(self):
+        pass
+
+    def test_epoch(self):
+        self.assertEqual(coptic.to_jd(1, 1, 1), coptic.EPOCH)
+        self.assertEqual(coptic.to_jd(1, 1, 2), coptic.EPOCH + 1)
+        self.assertEqual(coptic.to_jd(2, 1, 1), coptic.EPOCH + 365.0)
+        self.assertEqual(coptic.from_jd(coptic.EPOCH), (1, 1, 1))
+
+    def test_is_leap(self):
+        self.assertTrue(coptic.is_leap(1839))
+        self.assertTrue(coptic.is_leap(1891))
+        self.assertTrue(coptic.is_leap(1999))
+        self.assertTrue(coptic.is_leap(2423))
+
+        self.assertFalse(coptic.is_leap(1800))
+        self.assertFalse(coptic.is_leap(1890))
+        self.assertFalse(coptic.is_leap(1956))
+        self.assertFalse(coptic.is_leap(2000))
+
+    def test_reflexive_jd(self):
+        self.assertEqual(coptic.from_jd(2431772.0), (1662, 3, 3))
+
+        # leap year 1891
+        self.assertEqual(coptic.from_jd(2515715.5), (1891, 13, 5))
+        self.assertEqual(coptic.to_jd(1891, 13, 5), 2515715.5)
+        self.assertEqual(coptic.from_jd(2515716.0), (1891, 13, 5))
+
+        self.assertEqual(coptic.from_jd(2515716.5), (1891, 13, 6))
+        self.assertEqual(coptic.to_jd(1891, 13, 6), 2515716.5)
+        self.assertEqual(coptic.from_jd(2515717.0), (1891, 13, 6))
+
+        self.assertEqual(coptic.from_jd(2515717.5), (1892, 1, 1))
+        self.assertEqual(coptic.to_jd(1892, 1, 1), 2515717.5)
+        self.assertEqual(coptic.from_jd(2515718.0), (1892, 1, 1))
+
+        # regular year 2000 (%4=0)
+        self.assertEqual(coptic.from_jd(2555528.0), (2000, 13, 4))
+        self.assertEqual(coptic.from_jd(2555528.5), (2000, 13, 5))
+        self.assertEqual(coptic.to_jd(2000, 13, 5), 2555528.5)
+        self.assertEqual(coptic.from_jd(2555529.0), (2000, 13, 5))
+        self.assertEqual(coptic.from_jd(2555529.5), (2001, 1, 1))
+
+        # regular year 1889 (%4=1)
+        self.assertEqual(coptic.from_jd(2514984.5), (1889, 13, 4))
+        self.assertEqual(coptic.to_jd(1889, 13, 4), 2514984.5)
+        self.assertEqual(coptic.from_jd(2514985.0), (1889, 13, 4))
+
+        self.assertEqual(coptic.from_jd(2514985.5), (1889, 13, 5))
+        self.assertEqual(coptic.to_jd(1889, 13, 5), 2514985.5)
+        self.assertEqual(coptic.from_jd(2514986.0), (1889, 13, 5))
+
+        # regular year 1886 (%4=2)
+        self.assertEqual(coptic.from_jd(2513888.5), (1886, 13, 4))
+        self.assertEqual(coptic.to_jd(1886, 13, 4), 2513888.5)
+        self.assertEqual(coptic.from_jd(2513889.0), (1886, 13, 4))
+        self.assertEqual(coptic.from_jd(2513889.5), (1886, 13, 5))
+        self.assertEqual(coptic.to_jd(1886, 13, 5), 2513889.5)
+        self.assertEqual(coptic.from_jd(2513890.0), (1886, 13, 5))
+        self.assertEqual(coptic.from_jd(2513890.5), (1887, 1, 1))
+        self.assertEqual(coptic.to_jd(1887, 1, 1), 2513890.5)
+        self.assertEqual(coptic.from_jd(2513891.0), (1887, 1, 1))

{convertdate-2.4.1 → convertdate-2.5.0}/tests/test_ordinal.py

@@ -1,6 +1,6 @@
 from calendar import isleap
 
-from convertdate import ordinal
+from convertdate import gregorian, ordinal
 
 from . import CalTestCase
 
@@ -57,3 +57,32 @@ class TestOrdinal(CalTestCase):
                 self.assertEqual(ordinal.from_gregorian(year, 2, 29), (year, 60))
 
             self.assertEqual(ordinal.from_gregorian(year, 3, 1), (year, 60 + leap))
+
+    def test_from_jd_dec_31_common_year(self):
+        # An integer Julian day count for December 31 of a common year must map
+        # to ordinal day 365, not the non-existent day 366. Regression for the
+        # ``round(365.5) -> 366`` half-day rounding bug in ``from_jd``.
+        for year in (2021, 2022, 2023, 2025, 2100, 2200):
+            self.assertFalse(isleap(year))
+            jd = gregorian.to_jd(year, 12, 31)  # ...5 (midnight) form
+            self.assertEqual(ordinal.from_jd(jd), (year, 365))
+            # and the integer JDN that gregorian maps to that same day
+            self.assertEqual(ordinal.from_jd(int(jd) + 1), (year, 365))
+
+    def test_from_jd_dec_31_leap_year(self):
+        # Leap-year December 31 stays day 366.
+        for year in (2020, 2024, 2000):
+            self.assertTrue(isleap(year))
+            self.assertEqual(ordinal.from_jd(gregorian.to_jd(year, 12, 31)), (year, 366))
+            self.assertEqual(ordinal.from_jd(int(gregorian.to_jd(year, 12, 31)) + 1), (year, 366))
+
+    def test_from_jd_consistent_with_gregorian(self):
+        # For any Julian day -- integer count or ``.5`` midnight form -- the
+        # ordinal date must describe the same calendar day as gregorian.from_jd,
+        # and never yield a day of year beyond the length of its year.
+        for jd in range(2415020, 2488395, 7):
+            for j in (jd, jd + 0.5):
+                year, doy = ordinal.from_jd(j)
+                self.assertEqual((year, doy), ordinal.from_gregorian(*gregorian.from_jd(j)))
+                self.assertLessEqual(doy, 366 if isleap(year) else 365)
+                self.assertGreaterEqual(doy, 1)