File fix-pytz-tests.patch of Package python-khal

Overview Repositories Revisions Requests Users Attributes Meta

File fix-pytz-tests.patch of Package python-khal (Revision c45cc738f7eb58200ebcd87207cccb42)

Currently displaying revision c45cc738f7eb58200ebcd87207cccb42 , Show latest

From f6c9b8a53a0f12222b2ee25c82229b0605b8785a Mon Sep 17 00:00:00 2001
From: Christian Geier <geier@lostpackets.de>
Date: Tue, 30 Aug 2022 23:26:23 +0200
Subject: [PATCH] tests working with latest pytz version

We had assumed that pytz versions would always follow the schema
year.month, but pytz 2022.2.1 broke that assumption and our code. We
should now be able to deal with pytz versions in the
year.month.anything.

fix #1180
---
 setup.py                | 1 +
 tests/conftest.py       | 8 --------
 tests/event_test.py     | 5 +++--
 tests/vtimezone_test.py | 5 +++--
 5 files changed, 9 insertions(+), 12 deletions(-)

Index: khal-0.10.5/setup.py
===================================================================
--- khal-0.10.5.orig/setup.py
+++ khal-0.10.5/setup.py
@@ -26,6 +26,7 @@ requirements = [
 
 test_requirements = [
     'freezegun',
+    'packaging',
     'vdirsyncer',
 ]
 
Index: khal-0.10.5/tests/conftest.py
===================================================================
--- khal-0.10.5.orig/tests/conftest.py
+++ khal-0.10.5/tests/conftest.py
@@ -3,7 +3,6 @@ import os
 from time import sleep
 
 import pytest
-import pytz
 
 from khal.khalendar import CalendarCollection
 from khal.khalendar.vdir import Vdir
@@ -106,13 +105,6 @@ def sleep_time(tmpdir_factory):
     )
 
 
-@pytest.fixture(scope='session')
-def pytz_version():
-    """Return the version of pytz as a tuple."""
-    year, month = pytz.__version__.split('.')
-    return int(year), int(month)
-
-
 @pytest.fixture
 def fix_caplog(monkeypatch):
     """Temporarily undoes the logging setup by click-log such that the caplog fixture can be used"""
Index: khal-0.10.5/tests/event_test.py
===================================================================
--- khal-0.10.5.orig/tests/event_test.py
+++ khal-0.10.5/tests/event_test.py
@@ -4,6 +4,7 @@ import pytest
 import pytz
 from freezegun import freeze_time
 from icalendar import Parameters, vCalAddress, vRecur, vText
+from packaging import version
 
 from khal.khalendar.event import (AllDayEvent, Event, FloatingEvent,
                                   LocalizedEvent, create_timezone)
@@ -339,12 +340,12 @@ def test_event_dt_long():
         '09.04.2014 09:30-12.04.2014 10:30 An Event\x1b[0m'
 
 
-def test_event_no_dst(pytz_version):
+def test_event_no_dst():
     """test the creation of a corect VTIMEZONE for timezones with no dst"""
     event_no_dst = _get_text('event_no_dst')
     cal_no_dst = _get_text('cal_no_dst')
     event = Event.fromString(event_no_dst, calendar='foobar', locale=LOCALE_BOGOTA)
-    if pytz_version > (2017, 1):
+    if version.parse(pytz.__version__) > version.Version('2017.1'):
         cal_no_dst = cal_no_dst.replace(
             'TZNAME:COT',
             'RDATE:20380118T221407\r\nTZNAME:-05'
Index: khal-0.10.5/tests/vtimezone_test.py
===================================================================
--- khal-0.10.5.orig/tests/vtimezone_test.py
+++ khal-0.10.5/tests/vtimezone_test.py
@@ -1,6 +1,7 @@
 import datetime as dt
 
 import pytz
+from packaging import version
 
 from khal.khalendar.event import create_timezone
 
@@ -63,7 +64,7 @@ def test_berlin_rdate():
     assert vberlin_dst in vberlin
 
 
-def test_bogota(pytz_version):
+def test_bogota():
     vbogota = [b'BEGIN:VTIMEZONE',
                b'TZID:America/Bogota',
                b'BEGIN:STANDARD',
@@ -74,7 +75,7 @@ def test_bogota(pytz_version):
                b'END:STANDARD',
                b'END:VTIMEZONE',
                b'']
-    if pytz_version > (2017, 1):
+    if version.parse(pytz.__version__) > version.Version('2017.1'):
         vbogota[4] = b'TZNAME:-05'
         vbogota.insert(4, b'RDATE:20380118T221407')

Places

File fix-pytz-tests.patch of Package python-khal (Revision c45cc738f7eb58200ebcd87207cccb42)

Places