Skip to content

added more testcases and fixed some wrong enums #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Mar 18, 2022
Merged

added more testcases and fixed some wrong enums #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36dda82
added more testcases and fixed some wrong enums
Mar 18, 2022
6499534
almost forgot to add the version change...
Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions datetimeparser/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class Constants:
INFINITY = Constant('infinity', ['inf'], value=-1)

TODAY = Constant('today', options=[ConstantOption.TIME_VARIABLE], time_value=lambda _: datetime(datetime.today().year, datetime.today().month, datetime.today().day))
TOMORROW = Constant('tomorrow', options=[ConstantOption.TIME_VARIABLE], time_value=lambda _: datetime.today() + relativedelta(days=1))
YESTERDAY = Constant('yesterday', options=[ConstantOption.TIME_VARIABLE], time_value=lambda _: datetime.today() - relativedelta(days=1))
TOMORROW = Constant('tomorrow', options=[ConstantOption.TIME_VARIABLE], time_value=lambda _: datetime(datetime.today().year, datetime.today().month, datetime.today().day) + relativedelta(days=1))
YESTERDAY = Constant('yesterday', options=[ConstantOption.TIME_VARIABLE], time_value=lambda _: datetime(datetime.today().year, datetime.today().month, datetime.today().day) - relativedelta(days=1))
NOW = Constant('now', ['at the moment', 'current time', 'current time now'], time_value=lambda _: datetime.now())

ALL = [
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
long_description_content_type="text/markdown",
long_description=long_description,
packages=['datetimeparser'],
version='0.6rc', # version number: https://peps.python.org/pep-0440/
version='0.7rc', # version number: https://peps.python.org/pep-0440/
license='MIT',
description='A parser library built for parsing the english language into datetime objects.',
author='Ari24',
Expand Down
31 changes: 20 additions & 11 deletions tests/testcases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"halloween 2030": datetime.datetime(2030, 10, 31),
"next april fools day": datetime.datetime(today.year, 4, 1),
"thanksgiving": datetime.datetime(year=today.year, month=11, day=24),
"next st patricks day": datetime.datetime(year=today.year, month=3, day=17),
"next st patricks day": datetime.datetime(year=2023, month=3, day=17),
"valentine day 2010": datetime.datetime(2010, 2, 14),
"summer": datetime.datetime(today.year, 6, 1),
"winter 2021": datetime.datetime(2021, 12, 1),
Expand All @@ -74,18 +74,27 @@
"end of aoc 2022": datetime.datetime(2022, 12, 26, 6),
"end of the year": datetime.datetime(today.year, 12, 31, 23, 59, 59),
# Constant Relative Extensions
"daylight change tomorrow": None,
"daylight change yesterday": None,
"daylight change 01.01.2022": None,
"daylight change tomorrow": datetime.datetime(today.year, today.month, today.day, 6) + relativedelta(days=1),
"daylight change yesterday": datetime.datetime(today.year, today.month, today.day, 6) + relativedelta(days=-1),
"daylight change 01.01.2022": datetime.datetime(2022, 1, 1, 6),
"monday in two weeks": None,
"tuesday in two years": None,
"tomorrow 12 o'clock": None,
"tomorrow at 7pm": None,
"tomorrow at 17h": None,
"tomorrow at 17:13": None,
"tomorrow at 17": None,
"tomorrow afternoon": None,
"at the next afternoon at tomorrow": None,
"tomorrow 12 o'clock": datetime.datetime(today.year, today.month, today.day, 12) + relativedelta(days=1),
"tomorrow at 7pm": datetime.datetime(today.year, today.month, today.day, 19) + relativedelta(days=1),
"tomorrow at 17h": datetime.datetime(today.year, today.month, today.day, 17) + relativedelta(days=1),
"tomorrow at 17:13": datetime.datetime(today.year, today.month, today.day, 17, 13) + relativedelta(days=1),
"tomorrow at 17": datetime.datetime(today.year, today.month, today.day, 17) + relativedelta(days=1),
"tomorrow afternoon": datetime.datetime(today.year, today.month, today.day, 15) + relativedelta(days=1),
"at the next afternoon at tomorrow": datetime.datetime(today.year, today.month, today.day, 15) + relativedelta(days=1),
"the day before yesterday": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=-2),
"the day after tomorrow": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=2),
"a day before yesterday": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=-2),
"a day after tomorrow": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=2),
"day before yesterday": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=-2),
"day after tomorrow": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=2),
"two days after tomorrow": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=3),
"two days before yesterday": datetime.datetime(today.year, today.month, today.day) + relativedelta(days=-3),

# Datetime Delta
"at 9pm": datetime.datetime(today.year, today.month, today.day, 21),
"at 9:00pm": datetime.datetime(today.year, today.month, today.day, 21),
Expand Down