resolve conflict

.gitignore

@@ -137,15 +137,9 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-# Requests-cache
-redmine_cache.sqlite
-
 #####################################################
 # CUSTOM
 
-# requests cache
-instagram_cache.sqlite
-
 # direnv
 .envrc
 

.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,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml
+known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml

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
 

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
 

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")
 

district/migrations/0109_districtpersonpage_ical_calendar_url.py

@@ -4,15 +4,20 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('district', '0108_alter_districtcenterpage_content_and_more'),
+        ("district", "0108_alter_districtcenterpage_content_and_more"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='districtpersonpage',
-            name='ical_calendar_url',
-            field=models.URLField(blank=True, help_text='Podporuje Mrak, Google Kalendář a další. Návod na synchronizaci najdeš na pi2.cz/kalendare', max_length=256, null=True, verbose_name='iCal adresa kalendáře'),
+            model_name="districtpersonpage",
+            name="ical_calendar_url",
+            field=models.URLField(
+                blank=True,
+                help_text="Podporuje Mrak, Google Kalendář a další. Návod na synchronizaci najdeš na pi2.cz/kalendare",
+                max_length=256,
+                null=True,
+                verbose_name="iCal adresa kalendáře",
+            ),
         ),
     ]

requirements/base.in

@@ -12,7 +12,7 @@ pirates<=0.7
 whitenoise
 opencv-python
 requests
-icalevnt
+icalevents
 ics
 arrow
 sentry-sdk

requirements/base.txt

 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile base.in
@@ -68,8 +68,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
@@ -117,8 +117,6 @@ draftjs-exporter==2.1.7
     # via wagtail
 et-xmlfile==1.1.0
     # via openpyxl
-exceptiongroup==1.1.1
-    # via cattrs
 executing==1.2.0
     # via stack-data
 fastjsonschema==2.16.3
@@ -129,11 +127,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
@@ -198,7 +196,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
@@ -208,7 +206,7 @@ python-dateutil==2.8.2
     # via
     #   arrow
     #   icalendar
-    #   icalevnt
+    #   icalevents
     #   ics
 pytz==2021.3
     # via
@@ -217,7 +215,7 @@ pytz==2021.3
     #   django-modelcluster
     #   djangorestframework
     #   icalendar
-    #   icalevnt
+    #   icalevents
     #   l18n
 pyyaml==6.0
     # via -r base.in

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

shared/models.py

 import json
 import logging
+from datetime import date, timedelta
 
 import requests
-from datetime import date, timedelta
 from django.core.cache import cache
 from django.db import models
 from django.utils import timezone

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")

tests/calendar_utils/test_parser.py

 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