Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-khal for openSUSE:Factory checked in at 2022-10-08 01:23:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-khal (Old) and /work/SRC/openSUSE:Factory/.python-khal.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-khal" Sat Oct 8 01:23:29 2022 rev:3 rq:1008344 version:0.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-khal/python-khal.changes 2022-01-19 00:35:49.858317708 +0100 +++ /work/SRC/openSUSE:Factory/.python-khal.new.2275/python-khal.changes 2022-10-08 01:23:33.826001049 +0200 @@ -1,0 +2,18 @@ +Thu Oct 6 07:07:28 UTC 2022 - Danilo Spinella <[email protected]> + +- Update to 0.10.5: + * FIX support for tzlocal >= 4.0 + * FIX ability to show an event's calendar in ikhal + * FIX an error logging for certain broken icalendar events that made ikhal crash + after editing those events + * NEW Add widget to interactive event editor that allows adding attendees as + comma separated list of email addresses + * FIX event creation for events after the second next DST transition + * NEW Add support for Python 3.10 + * CHANGE search, at, and list don't print "No events" anymore if no matching + events are found + * NEW Add option to use multiple color only when not all calendar colors can + be displayed. +- Add fix-pytz-tests.patch to fix tests with latest pytz version + +------------------------------------------------------------------- Old: ---- khal-0.10.4.tar.gz New: ---- fix-pytz-tests.patch khal-0.10.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-khal.spec ++++++ --- /var/tmp/diff_new_pack.uq6Uly/_old 2022-10-08 01:23:34.338002222 +0200 +++ /var/tmp/diff_new_pack.uq6Uly/_new 2022-10-08 01:23:34.342002232 +0200 @@ -19,13 +19,16 @@ %define skip_python36 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-khal -Version: 0.10.4 +Version: 0.10.5 Release: 0 Summary: CLI calendar with CalDAV support License: MIT Group: Productivity/Office/Organizers URL: https://lostpackets.de/khal/ Source0: https://files.pythonhosted.org/packages/source/k/khal/khal-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix tests with latest pytz version +# https://github.com/pimutils/khal/commit/f6c9b8a53a0f12222b2ee25c82229b0605b8785a +Patch0: fix-pytz-tests.patch BuildRequires: %{python_module atomicwrites >= 0.1.7} BuildRequires: %{python_module click >= 3.2} BuildRequires: %{python_module click-log >= 0.2.0} @@ -33,6 +36,8 @@ BuildRequires: %{python_module dateutil} BuildRequires: %{python_module freezegun} BuildRequires: %{python_module icalendar >= 4.0.3} +# Test dependency added by Patch0 +BuildRequires: %{python_module packaging} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module pyxdg} @@ -62,7 +67,7 @@ calendars with a variety of other programs on a host of different platforms. %prep -%setup -q -n khal-%{version} +%autosetup -p1 -n khal-%{version} %build %python_build ++++++ fix-pytz-tests.patch ++++++ >From f6c9b8a53a0f12222b2ee25c82229b0605b8785a Mon Sep 17 00:00:00 2001 From: Christian Geier <[email protected]> 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): ) [email protected](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') ++++++ khal-0.10.4.tar.gz -> khal-0.10.5.tar.gz ++++++ ++++ 3184 lines of diff (skipped)
