diff --git a/.isort.cfg b/.isort.cfg index 793ccf442a3b99141fbea1834586b3ce1fd83bd8..e59d6737ecc09e8863549d5b0ff2cc19f454f693 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -3,4 +3,4 @@ line_length = 88 multi_line_output = 3 include_trailing_comma = true -known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,requests_cache,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml +known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,markdown,modelcluster,pirates,pytest,pytz,requests,requests_cache,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml diff --git a/calendar_utils/migrations/0004_auto_20220505_1228.py b/calendar_utils/migrations/0004_auto_20220505_1228.py index 4d4bff6a2bf53efb2b2c318f20b96b90b878ab32..62f0bfa4fdd74cc5b80b039913835228bdc47e36 100644 --- a/calendar_utils/migrations/0004_auto_20220505_1228.py +++ b/calendar_utils/migrations/0004_auto_20220505_1228.py @@ -3,7 +3,7 @@ from datetime import date, timedelta import arrow from django.db import migrations -from icalevnt import icalevents +from icalevents import icalevents from calendar_utils.parser import process_event_list diff --git a/calendar_utils/models.py b/calendar_utils/models.py index 335161250f7c8c763a9fb89a11f700035984b25a..939e7c02d2a9c7ea24019a8ca838b71588e60946 100644 --- a/calendar_utils/models.py +++ b/calendar_utils/models.py @@ -4,7 +4,7 @@ from datetime import date, timedelta import arrow from django.core.serializers.json import DjangoJSONEncoder from django.db import models -from icalevnt import icalevents +from icalevents import icalevents from .parser import process_event_list diff --git a/calendar_utils/parser.py b/calendar_utils/parser.py index 504cc20c8f78d64e9d98a8c5b3a5d891f040a9b0..1cefdbd6318438a4a03df51cc6004f3ef9e80f7c 100644 --- a/calendar_utils/parser.py +++ b/calendar_utils/parser.py @@ -7,7 +7,7 @@ import bleach from django.conf import settings if TYPE_CHECKING: - from icalevnt.icalparser import Event + from icalevents.icalparser import Event EVENT_KEYS = ("start", "end", "all_day", "summary", "description", "location") diff --git a/requirements/base.in b/requirements/base.in index d7f49b0fd4baac6d2af16bc6fd0189e83deafee2..f9cdb53c82669bf99d1d7745b60a713cdb65df5b 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -13,7 +13,7 @@ whitenoise opencv-python requests requests-cache -icalevnt +icalevents ics arrow sentry-sdk diff --git a/requirements/base.txt b/requirements/base.txt index c31ed644a1767c846441ea0bdce54d3dc8e2900f..dd21a27ae0800e78347ac15b8385569b6d3b9466 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -70,8 +70,8 @@ cryptography==40.0.1 # pyopenssl cssselect2==0.7.0 # via weasyprint -datetime==4.3 - # via icalevnt +datetime==4.9 + # via icalevents decorator==5.1.1 # via ipython django==4.1.8 @@ -131,11 +131,11 @@ html5lib==1.1 # via # wagtail # weasyprint -httplib2==0.20.1 - # via icalevnt -icalendar==4.0.8 - # via icalevnt -icalevnt==0.1.26 +httplib2==0.20.4 + # via icalevents +icalendar==4.0.9 + # via icalevents +icalevents==0.1.27 # via -r base.in ics==0.7.2 # via -r base.in @@ -200,7 +200,7 @@ pygments==2.15.0 # via ipython pyopenssl==23.1.1 # via josepy -pyparsing==2.4.7 +pyparsing==3.0.9 # via httplib2 pypdf2==3.0.1 # via -r base.in @@ -210,7 +210,7 @@ python-dateutil==2.8.2 # via # arrow # icalendar - # icalevnt + # icalevents # ics pytz==2021.3 # via @@ -219,7 +219,7 @@ pytz==2021.3 # django-modelcluster # djangorestframework # icalendar - # icalevnt + # icalevents # l18n pyyaml==6.0 # via -r base.in diff --git a/requirements/dev.txt b/requirements/dev.txt index e3a023da69a1c8d99ccd3a800807e4be76c269a6..e5f64f07d48dd64642504ce81b0f53e39febcd9f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -28,7 +28,7 @@ inflection==0.5.1 # via pytest-factoryboy iniconfig==2.0.0 # via pytest -packaging==23.0 +packaging==23.1 # via # pytest # pytest-sugar diff --git a/tests/calendar_utils/conftest.py b/tests/calendar_utils/conftest.py index d8e3018a72a2949ff9f61c5d96ae7556c62c4d89..1aea614630b9fab206a7f52970cf82a8854075d0 100644 --- a/tests/calendar_utils/conftest.py +++ b/tests/calendar_utils/conftest.py @@ -3,7 +3,7 @@ from datetime import datetime from pathlib import Path import pytest -from icalevnt.icalparser import Event +from icalevents.icalparser import Event @pytest.fixture(scope="session") diff --git a/tests/calendar_utils/test_parser.py b/tests/calendar_utils/test_parser.py index 8c1f141468d89de38cfc16bb33108e1dff382cc4..c34fdbedc6d37ef6b367f89ebb3cb1d05af47ccb 100644 --- a/tests/calendar_utils/test_parser.py +++ b/tests/calendar_utils/test_parser.py @@ -1,9 +1,7 @@ from datetime import datetime -from zoneinfo import ZoneInfo -import arrow import pytest -from icalevnt.icalparser import Event +from icalevents.icalparser import Event from calendar_utils.parser import ( process_event_list, @@ -20,7 +18,7 @@ def test_split_events(sample_response, sample_future_events, sample_past_events) @pytest.mark.freeze_time("2022-05-13") -def test_split_events(sample_events, sample_future_events, sample_past_events): +def test_split_dist_list(sample_events, sample_future_events, sample_past_events): past_events, future_events = split_event_dict_list(sample_events) assert sample_past_events == past_events assert sample_future_events == future_events