opendate 0.1.8__tar.gz → 0.1.10__tar.gz

{opendate-0.1.8 → opendate-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opendate
-Version: 0.1.8
+Version: 0.1.10
 Summary: Python business datetimes
 Home-page: https://github.com/bissli/opendate
 License: MIT

{opendate-0.1.8 → opendate-0.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "opendate"
-version = "0.1.8"
+version = "0.1.10"
 description = "Python business datetimes"
 authors = ["bissli <bissli.xyz@protonmail.com>"]
 readme = "README.md"

{opendate-0.1.8 → opendate-0.1.10}/src/date/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.8'
+__version__ = '0.1.10'
 
 import datetime as _datetime
 

{opendate-0.1.8 → opendate-0.1.10}/src/date/date.py

@@ -272,20 +272,22 @@ class NYSE(Entity):
     @staticmethod
     @lru_cache
     def business_days(begdate=BEGDATE, enddate=ENDDATE) -> set:
-        return {d.date() for d in NYSE.calendar.valid_days(begdate, enddate)}
+        return {Date.instance(d.date())
+                for d in NYSE.calendar.valid_days(begdate, enddate)}
 
     @staticmethod
     @lru_cache
     def business_hours(begdate=BEGDATE, enddate=ENDDATE) -> dict:
         df = NYSE.calendar.schedule(begdate, enddate, tz=EST)
-        open_close = [(o.to_pydatetime(), c.to_pydatetime())
+        open_close = [(DateTime.instance(o.to_pydatetime()),
+                       DateTime.instance(c.to_pydatetime()))
                       for o, c in zip(df.market_open, df.market_close)]
         return dict(zip(df.index.date, open_close))
 
     @staticmethod
     @lru_cache
     def business_holidays(begdate=BEGDATE, enddate=ENDDATE) -> set:
-        return {d.date()
+        return {Date.instance(d.date())
                 for d in map(pd.to_datetime, NYSE.calendar.holidays().holidays)
                 if begdate <= d <= enddate}
 
@@ -1354,12 +1356,29 @@ class Interval:
           set  -  set    end=beg + num
            -  set set    beg=end - num
 
-        >>> Interval('4/3/2014', None).b.range(3)
+        Basic/legacy cases
+        >>> Interval(Date(2014, 4, 3), None).b.range(3)
         (Date(2014, 4, 3), Date(2014, 4, 8))
         >>> Interval(None, Date(2014, 7, 27)).range(20)
         (Date(2014, 7, 7), Date(2014, 7, 27))
-        >>> Interval(None, '2014/7/27').b.range(20)
+        >>> Interval(None, Date(2014, 7, 27)).b.range(20)
         (Date(2014, 6, 27), Date(2014, 7, 27))
+
+        Do not modify dates if both are provided
+        >>> Interval(Date(2024, 7, 25), Date(2024, 7, 25)).b.range(None)
+        (Date(2024, 7, 25), Date(2024, 7, 25))
+        >>> Interval(Date(2024, 7, 27), Date(2024, 7, 27)).b.range(None)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+
+        Edge cases (7/27/24 is weekend)
+        >>> Interval(Date(2024, 7, 27), None).b.range(0)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+        >>> Interval(None, Date(2024, 7, 27)).b.range(0)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+        >>> Interval(Date(2024, 7, 27), None).b.range(1)
+        (Date(2024, 7, 27), Date(2024, 7, 29))
+        >>> Interval(None, Date(2024, 7, 27)).b.range(1)
+        (Date(2024, 7, 26), Date(2024, 7, 27))
         """
         begdate, enddate = self.begdate, self.enddate
 
@@ -1373,17 +1392,14 @@ class Interval:
             raise IntervalError('Missing begdate and enddate, window specified')
 
         if begdate and enddate:
-            return (begdate.business() if begdate._business else
-                    begdate).add(days=window), \
-                   (enddate.business() if enddate._business else
-                    enddate).subtract(days=0)
-
-        if (not begdate and not enddate) or enddate:
-            begdate = (enddate.business() if enddate._business else
-                       enddate).subtract(days=window)
+            pass  # do nothing if both provided
+        elif (not begdate and not enddate) or enddate:
+            begdate = enddate.subtract(days=window) if window else enddate
         else:
-            enddate = (begdate.business() if begdate._business else
-                       begdate).add(days=window)
+            enddate = begdate.add(days=window) if window else begdate
+
+        enddate._business = False
+        begdate._business = False
 
         return begdate, enddate