From 1d4f30bc30af7a103f348337fc236b419c871c49 Mon Sep 17 00:00:00 2001 From: Tobias Brox Date: Thu, 17 Nov 2022 20:15:02 +0100 Subject: [PATCH] https://github.com/niccokunzmann/python-recurring-ical-events/issues/97 is resolved --- setup.py | 4 ++-- tests/test_caldav.py | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 041d177e..fae0e532 100755 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ "coverage", "tzlocal", "pytz", - "xandikos<0.2.4", + "xandikos", "radicale", ] @@ -71,7 +71,7 @@ "requests", "six", "icalendar", - "recurring-ical-events", + "recurring-ical-events>=1.1.0b", ] + extra_packages, tests_require=test_packages + extra_test_packages, diff --git a/tests/test_caldav.py b/tests/test_caldav.py index 8f3ee04d..4c524b0b 100644 --- a/tests/test_caldav.py +++ b/tests/test_caldav.py @@ -1495,11 +1495,7 @@ def testTodoDatesearch(self): ## TODO: the conditions can be removed once ## https://github.com/niccokunzmann/python-recurring-ical-events/issues/97 ## has been properly fixed - if ( - not self.check_compatibility_flag("no_recurring_expandation") - and not self.check_compatibility_flag("no_expand") - and not self.check_compatibility_flag("no_recurring_todo_expand") - ): + if not self.check_compatibility_flag("no_expand"): assert len([x for x in todos if "DTSTART:20020415T1330" in x.data]) == 1 ## exercise the default for expand (maybe -> False for open-ended search) @@ -1976,8 +1972,6 @@ def testRecurringDateSearch(self): ## According to https://tools.ietf.org/html/rfc4791#section-7.8.3, the ## resultset should be one vcalendar with two events. assert len(r) == 1 - - ## not all servers supports expandation assert "RRULE" not in r[0].data assert r[0].data.count("END:VEVENT") == 2