Skip to content

bump pendulum version #7

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

Open
IlyaSukhanov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bump pendulum version #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion VER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2
0.6.3
10 changes: 5 additions & 5 deletions objectpath/core/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys, re

import pendulum
from pendulum.period import Period
from pendulum.interval import Interval
from datetime import datetime

from .parser import parse
Expand Down Expand Up @@ -233,9 +233,9 @@ def toobj_generator(left, snd):
return any(
x in max(fst, snd, key=len) for x in min(fst, snd, key=len)
)
if isinstance(fst, Period) and isinstance(snd, Period):
if isinstance(fst, Interval) and isinstance(snd, Interval):
return bool(snd.start <= fst.start and snd.end >= fst.end)
if isinstance(fst, datetime) and isinstance(snd, Period):
if isinstance(fst, datetime) and isinstance(snd, Interval):
return bool(snd.start <= fst and snd.end >= fst)
return exe(node[1]) in exe(node[2])
elif op == "not in":
Expand All @@ -246,9 +246,9 @@ def toobj_generator(left, snd):
return not any(
x in max(fst, snd, key=len) for x in min(fst, snd, key=len)
)
if isinstance(fst, Period) and isinstance(snd, Period):
if isinstance(fst, Interval) and isinstance(snd, Interval):
return bool(snd.start > fst.start or snd.end < fst.end)
if isinstance(fst, datetime) and isinstance(snd, Period):
if isinstance(fst, datetime) and isinstance(snd, Interval):
return bool(snd.start > fst or snd.end < fst)
return exe(node[1]) not in exe(node[2])
elif op in ("is", "is not"):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pendulum
pendulum>=3.0
pytz