Merge pull request #115 from dh-tech/feature/reorg-interval

Move interval object and tests into separate files

Author: rlskoeser

docs/undate/core.rst

@@ -1,13 +1,16 @@
 Undate objects
 ==============
 
-undates and undate intervals
+dates, intervals, and calendar
 ------------------------------
 
 .. autoclass:: undate.undate.Undate
    :members:
 
-.. autoclass:: undate.undate.UndateInterval
+.. autoclass:: undate.undate.Calendar
+   :members:
+
+.. autoclass:: undate.interval.UndateInterval
    :members:
 
 date, timedelta, and date precision

examples/notebooks/shxco_partial_date_durations.ipynb

@@ -316,14 +316,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {
     "id": "y_MqgrQW64uI"
    },
    "outputs": [],
    "source": [
+    "from undate import UndateInterval\n",
     "from undate.date import ONE_DAY\n",
-    "from undate.undate import UndateInterval\n",
     "from undate.converters.iso8601 import ISO8601DateFormat\n",
     "\n",
     "def undate_duration(start_date, end_date):\n",

src/undate/__init__.py

@@ -1,6 +1,7 @@
 __version__ = "0.4.0.dev0"
 
 from undate.date import DatePrecision
-from undate.undate import Undate, UndateInterval
+from undate.undate import Undate, Calendar
+from undate.interval import UndateInterval
 
-__all__ = ["Undate", "UndateInterval", "DatePrecision", "__version__"]
+__all__ = ["Undate", "UndateInterval", "Calendar", "DatePrecision", "__version__"]

src/undate/converters/calendars/hebrew/converter.py

@@ -3,10 +3,10 @@
 from convertdate import hebrew  # type: ignore
 from lark.exceptions import UnexpectedCharacters
 
+from undate import Undate, UndateInterval
 from undate.converters.base import BaseCalendarConverter
 from undate.converters.calendars.hebrew.parser import hebrew_parser
 from undate.converters.calendars.hebrew.transformer import HebrewDateTransformer
-from undate.undate import Undate, UndateInterval
 
 
 class HebrewDateConverter(BaseCalendarConverter):

src/undate/converters/calendars/hebrew/transformer.py

@@ -1,6 +1,6 @@
 from lark import Transformer, Tree
 
-from undate.undate import Undate, Calendar
+from undate import Undate, Calendar
 
 
 class HebrewUndate(Undate):

src/undate/converters/calendars/hijri/converter.py

@@ -3,10 +3,10 @@
 from convertdate import islamic  # type: ignore
 from lark.exceptions import UnexpectedCharacters
 
+from undate import Undate, UndateInterval
 from undate.converters.base import BaseCalendarConverter
 from undate.converters.calendars.hijri.parser import hijri_parser
 from undate.converters.calendars.hijri.transformer import HijriDateTransformer
-from undate.undate import Undate, UndateInterval
 
 
 class HijriDateConverter(BaseCalendarConverter):

src/undate/converters/calendars/hijri/transformer.py

@@ -1,6 +1,6 @@
 from lark import Transformer, Tree
 
-from undate.undate import Undate, Calendar
+from undate import Undate, Calendar
 
 
 class HijriUndate(Undate):

src/undate/converters/edtf/converter.py

@@ -2,11 +2,12 @@
 
 from lark.exceptions import UnexpectedCharacters
 
+from undate import Undate, UndateInterval
 from undate.converters.base import BaseDateConverter
 from undate.converters.edtf.parser import edtf_parser
 from undate.converters.edtf.transformer import EDTFTransformer
 from undate.date import DatePrecision
-from undate.undate import Undate, UndateInterval
+
 
 #: character for unspecified digits
 EDTF_UNSPECIFIED_DIGIT: str = "X"

src/undate/converters/edtf/transformer.py

@@ -1,6 +1,6 @@
 from lark import Token, Transformer, Tree
 
-from undate.undate import Undate, UndateInterval
+from undate import Undate, UndateInterval
 
 
 class EDTFTransformer(Transformer):

src/undate/converters/iso8601.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Union
 
+from undate import Undate, UndateInterval
 from undate.converters.base import BaseDateConverter
-from undate.undate import Undate, UndateInterval
 
 
 class ISO8601DateFormat(BaseDateConverter):