Fixed installation issue with PyYAML and cython version.

BenAranaS · BenAranaS · commit 90252ca7fffd · 2024-01-03T11:04:07.000+01:00
Fixed duration from gtasks not a valid value issue by serialising before sync
diff --git a/cython_constraint.txt b/cython_constraint.txt
@@ -0,0 +1,4 @@
+Cython<3
+# echo "Cython<3" > cython_constraint.txt                                                 &#57522; &#10004; &#57522; base
+# PIP_CONSTRAINT=cython_constraint.txt pip3 install  "PyYAML<6.0.0,>=5.3.1"
+
diff --git a/syncall/taskwarrior/taskw_duration.py b/syncall/taskwarrior/taskw_duration.py
@@ -6,7 +6,7 @@
 
 from syncall.types import TaskwarriorRawItem
 
-tw_duration_key = "syncallduration"
+tw_duration_key = "twgcalsyncduration"
 
 
 def extract_part(s: str, split: str) -> Tuple[float, str]:
@@ -108,11 +108,11 @@ def parse_iso8601_duration(string: str) -> timedelta:
     return timedelta(days=days, hours=hours, minutes=minutes, seconds=seconds)
 
 
-def taskw_duration_serialize(value: timedelta) -> str:
+def duration_serialize(value: timedelta) -> str:
     """
-    >>> taskw_duration_serialize(timedelta(days=300))
+    >>> duration_serialize(timedelta(days=300))
     'PT25920000S'
-    >>> taskw_duration_serialize(timedelta(minutes=3))
+    >>> duration_serialize(timedelta(minutes=3))
     'PT180S'
     """
     # TODO atm (220220529) taskwarrior does not support float notation for its fields (i.e.,
@@ -121,33 +121,18 @@ def taskw_duration_serialize(value: timedelta) -> str:
     return "PT{}S".format(int(value.total_seconds()))
 
 
-def taskw_duration_deserialize(value: str) -> timedelta:
+def duration_deserialize(value: str) -> timedelta:
     return parse_iso8601_duration(value)
 
 
 def convert_tw_duration_to_timedelta(
-    item: TaskwarriorRawItem, default_duration=datetime.timedelta(hours=1)
-) -> None:
+    item: TaskwarriorRawItem, default_duration=duration_serialize(datetime.timedelta(hours=1))) -> None:
     if tw_duration_key in item.keys():
         duration = item[tw_duration_key]
         if isinstance(duration, str):
-            duration: datetime.timedelta = taskw_duration_deserialize(duration)
+            duration: datetime.timedelta = duration_deserialize(duration)
         assert isinstance(duration, datetime.timedelta)
     else:
         duration = default_duration
 
     item[tw_duration_key] = duration
-
-
-def convert_tw_duration_serialize(
-    item: TaskwarriorRawItem, default_duration=datetime.timedelta(hours=1)
-) -> None:
-    if tw_duration_key in item.keys():
-        duration = item[tw_duration_key]
-        if isinstance(duration, str):
-            duration: datetime.timedelta = taskw_duration_deserialize(duration)
-        assert isinstance(duration, datetime.timedelta)
-    else:
-        duration = default_duration
-
-    item[tw_duration_key] = taskw_duration_serialize(value=duration)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +Cython<3
 +# echo "Cython<3" > cython_constraint.txt                                                  ✔  base
 +# PIP_CONSTRAINT=cython_constraint.txt pip3 install  "PyYAML<6.0.0,>=5.3.1"
++