Merge pull request #258 from niccokunzmann/issue-257

make compatible with icalendar 6.* and 7.*

Author: niccokunzmann

.github/workflows/tests.yml

@@ -22,7 +22,8 @@ jobs:
         - ["3.12",  "py312", "Europe/London"]
         - ["3.12",  "build", "Europe/Moscow"]
         - ["3.13",  "py313", "America/Dawson"]
-        - ["3.13",  "docs",  "Europe/Berlin"]
+        - ["3.14",  "py314", "Africa/Tunis"]
+        - ["3.14",  "docs",  "Europe/Berlin"]
 
     runs-on: ubuntu-latest
     name: ${{ matrix.config[1] }}

docs/Makefile

@@ -22,7 +22,7 @@ venv:
 	pwd
 	git fetch --tags
 	python -m venv venv
-	venv/bin/pip install -r requirements.txt
+	venv/bin/pip install -r requirements.txt -e ..
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"

docs/changelog.md

@@ -18,6 +18,7 @@ To avoid breaking changes breaking your code, install this library fixed to a sp
 ## v3.8.1
 
 - Fix: License identifier in pyproject.toml
+- Mark as compatible with `icalendar` versions `6.*` and `7.*`. See [Issue 257](https://github.com/niccokunzmann/python-recurring-ical-events/issues/257).
 
 ## v3.8.0
 

docs/reference/api.md

@@ -34,8 +34,8 @@ For the most common cases, you do not need to look any further.
 ### list from `at()` and `between()`
 
 The result of both {py:meth}`recurring_ical_events.CalendarQuery.between` and
-{py:meth}`recurring_ical_events.CalendarQuery.at` is a list of {py:class}`icalendar.cal.Component`
-objects like {py:class}`icalendar.cal.Event`.
+{py:meth}`recurring_ical_events.CalendarQuery.at` is a list of {py:class}`icalendar.cal.component.Component`
+objects like {py:class}`icalendar.cal.event.Event`.
 By default, all attributes of the event with repetitions are copied, like ``UID`` and ``SUMMARY``.
 However, these attributes may differ from the source event:
 
@@ -75,7 +75,7 @@ Examples:
   you query that day it will appear regardless of the timezone of the query.
   Which is at different times in different timezones.
 
-* {py:class}`icalendar.cal.Alarm` has a `TRIGGER` which is in UTC.
+* {py:class}`icalendar.cal.alarm.Alarm` has a `TRIGGER` which is in UTC.
   The timezone to compute that for alarms relative to floating events will be taken
   from the start and stop arguments.
 

docs/requirements.in

@@ -0,0 +1,11 @@
+Sphinx>=7
+pydata-sphinx-theme
+sphinx-autobuild
+sphinx-copybutton
+sphinx-sitemap
+sphinx-autoapi>=3.0.0
+# For examples section
+myst-parser
+sphinx-autodoc-typehints
+sphinx-toolbox
+sphinx-tabs

docs/requirements.txt

@@ -1,12 +1,72 @@
-Sphinx>=7
-pydata-sphinx-theme
-sphinx-autobuild
-sphinx-copybutton
-..
-sphinx-sitemap
-sphinx-autoapi>=3.0.0
-# For examples section
-myst-parser
-sphinx-autodoc-typehints
-sphinx-toolbox
-sphinx-tabs
+
+Jinja2==3.1.6
+MarkupSafe==3.0.3
+PyYAML==6.0.3
+Pygments==2.19.2
+Sphinx==8.2.3
+accessible-pygments==0.0.5
+alabaster==1.0.0
+anyio==4.12.0
+apeye==1.4.1
+apeye-core==1.1.5
+astroid==4.0.2
+autodocsumm==0.2.14
+babel==2.17.0
+beautifulsoup4==4.14.3
+cachecontrol==0.14.4
+certifi==2025.11.12
+charset_normalizer==3.4.4
+click==8.3.1
+colorama==0.4.6
+cssutils==2.11.1
+dict2css==0.3.0.post1
+docutils==0.21.2
+domdf-python-tools==3.10.0
+filelock==3.20.1
+h11==0.16.0
+html5lib==1.1
+idna==3.11
+imagesize==1.4.1
+markdown-it-py==3.0.0
+mdit-py-plugins==0.5.0
+mdurl==0.1.2
+more-itertools==10.8.0
+msgpack==1.1.2
+myst-parser==4.0.1
+natsort==8.4.0
+packaging==25.0
+platformdirs==4.5.1
+pydata-sphinx-theme==0.16.1
+requests==2.32.5
+roman==5.2
+roman-numerals==4.1.0
+roman-numerals-py==4.1.0
+ruamel.yaml==0.18.17
+ruamel.yaml.clib==0.2.15
+six==1.17.0
+snowballstemmer==3.0.1
+soupsieve==2.8
+sphinx-autoapi==3.6.1
+sphinx-autobuild==2025.8.25
+sphinx-autodoc-typehints==3.5.2
+sphinx-copybutton==0.5.2
+sphinx-jinja2-compat==0.4.1
+sphinx-last-updated-by-git==0.3.8
+sphinx-prompt==1.10.2
+sphinx-sitemap==2.9.0
+sphinx-tabs==3.4.5
+sphinx-toolbox==4.1.0
+sphinxcontrib-applehelp==2.0.0
+sphinxcontrib-devhelp==2.0.0
+sphinxcontrib-htmlhelp==2.1.0
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==2.0.0
+sphinxcontrib-serializinghtml==2.0.0
+standard-imghdr==3.10.14
+starlette==0.50.0
+tabulate==0.9.0
+urllib3==2.6.2
+uvicorn==0.38.0
+watchfiles==1.1.1
+webencodings==0.5.1
+websockets==15.0.1

docs/user-guide/index.md

@@ -54,7 +54,7 @@ If not listed, this library is available as a package on the following platforms
 ## Usage
 
 The [icalendar] module is responsible for parsing files with a calendar specification in it.
-This library takes such a {py:class}`icalendar.cal.Calendar` and computes the occurrences.
+This library takes such a {py:class}`icalendar.cal.calendar.Calendar` and computes the occurrences.
 
 To import this module, write
 

pyproject.toml

@@ -36,12 +36,13 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 
 # install requirements depending on python version
 # see https://www.python.org/dev/peps/pep-0508/#environment-markers
 dependencies = [
-    'icalendar >= 6.1.0, < 7.0.0',
+    'icalendar >= 6.1.0, < 8.0.0',
     'python-dateutil >= 2.8.1, < 3.0.0',
     'x-wr-timezone >= 1.0.0, < 3.0.0; python_version >= "3.9"',
     'x-wr-timezone == 0.*; python_version <= "3.8"',

recurring_ical_events/__init__.py

@@ -65,8 +65,8 @@ def of(
     times according to ``X-WR-TIMEZONE``.
 
     Arguments:
-        a_calendar: an :class:`icalendar.cal.Calendar` component like
-            :class:`icalendar.cal.Calendar`.
+        a_calendar: an :class:`icalendar.cal.calendar.Calendar` component like
+            :class:`icalendar.cal.calendar.Calendar`.
         keep_recurrence_attributes: Whether to keep attributes that are only used
             to calculate the recurrence (``RDATE``, ``EXDATE``, ``RRULE``).
         components: A list of component type names of which the recurrences

recurring_ical_events/query.py

@@ -28,7 +28,7 @@
 from recurring_ical_events.util import compare_greater
 
 if TYPE_CHECKING:
-    from icalendar.cal import Component
+    from icalendar import Component
 
     from recurring_ical_events.occurrence import Occurrence
     from recurring_ical_events.series import Series
@@ -38,10 +38,10 @@
     )
 
 if sys.version_info >= (3, 10):
-    T_COMPONENTS : TypeAlias = Sequence[str | type[ComponentAdapter] | SelectComponents]
+    T_COMPONENTS: TypeAlias = Sequence[str | type[ComponentAdapter] | SelectComponents]
 else:
     # see https://github.com/python/cpython/issues/86399#issuecomment-1093889925
-    T_COMPONENTS : TypeAlias = Sequence[str]
+    T_COMPONENTS: TypeAlias = Sequence[str]
 
 
 class CalendarQuery:
@@ -58,7 +58,7 @@ class CalendarQuery:
             skip_bad_series is True
     """
 
-    suppressed_errors : ClassVar[type[Exception]] = [
+    suppressed_errors: ClassVar[type[Exception]] = [
         BadRuleStringFormat,
         PeriodEndBeforeStart,
         icalendar.InvalidCalendar,
@@ -111,7 +111,7 @@ def to_datetime(date: DateArgument):
             date: A date specification.
 
         Date Specification:
-        
+
         - a year like ``(2019,)`` or ``2019`` (:class:`int`)
         - a month like ``(2019, 1)`` for January of 2019
         - a day like ``(2019, 1, 19)`` for the first of January 2019