Adjust for and require icalendar>=6.0.0
#1364
Conversation
|
|
iamleot
force-pushed
the
icalendar-use-pytz
branch
from
3f42fc4
to
d38921d
Compare
For timezone functionalities icalendar can use both pytz and zoneinfo, preferring zoneinfo. We rely on pytz for several attributes, stick to it. Fixes pimutils#1361. Should obsolete pimutils#1363.
Per "Hacking" document.
iamleot
force-pushed
the
icalendar-use-pytz
branch
from
d38921d
to
31884be
Compare
In icalendar-6.0.0 windows_to_olson is part of icalendar.timezone.
iamleot
changed the title
icalendar>=6.0.0
|
The «docs/readthedocs.org:khal — Read the Docs build failed!» failures are probably unrelated to that. That's also tracked via #1356. |
Mmm, that's a good point. Maybe we can try to do some dance as follows... For try:
icalendar.use_pytz()
except AttributeError:
# assumes icalendar<6.0.0, only pytz is used
passWhile for try:
from icalendar.timezone import windows_to_olson
except ImportError:
from icalendar import windows_to_olson...and then replace the (Beware, both only written as comment, not really tested!) But, in particular the latter... IMHO is not very nice! However, if you think it's worth to be more version agnostic I'm happy to adjust the patch as described in this comment!
Thank you! |
|
Those could certainly work. Remembering to take them about later would be a pain. There's nothing strictly wrong with "New khal needs icalendar >=6. If you don't have it stick with the last version of khal" I think it's best to see if Christian or Hugo have an opinion on this (deliberately not tagging them for now) |
This was submitted upstream but hasn't been merged yet because they are trying to figure out how to maintain backwards compatibility with older py3-icalendar versions. pimutils/khal#1364
|
Hello folks! Can I help in any way to get that possibly merged and/or if you think it's better to make it much more generic and agnostic as shared in the comments I can try to adjust that PR too! Thank you! |
|
(Also, if I should rebase that to latest [Right now I have not seen any significant conflicts but it can be helpful to re-validate that too against latest |
This PR makes khal compatible with icalendar 6.0.0 and newer (and start to require it!).
In particular:
icalendarcan use bothpytzandzoneinfo, preferringzoneinfo. We rely onpytzfor several attributes, stick to it. This fixes Support icalendar v6 #1361 and should obsolete Replace tz.localize with date.replace #1363.icalendar.windows_to_olsonis no longer available, we need to refer to it asicalendar.timezone.windows_to_olsonWith this PR all the tests passes again with icalendar>=6.0.0.