Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-taskw for openSUSE:Factory checked in at 2021-08-20 16:57:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-taskw (Old) and /work/SRC/openSUSE:Factory/.python-taskw.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-taskw" Fri Aug 20 16:57:56 2021 rev:3 rq:913284 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-taskw/python-taskw.changes 2020-12-09 22:21:40.975691296 +0100 +++ /work/SRC/openSUSE:Factory/.python-taskw.new.1899/python-taskw.changes 2021-08-20 16:58:21.882828784 +0200 @@ -1,0 +2,6 @@ +Fri Aug 20 07:58:12 UTC 2021 - Fusion Future <[email protected]> + +- Add taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch to fix + build error with taskwarrior >= 2.5.2. + +------------------------------------------------------------------- New: ---- taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-taskw.spec ++++++ --- /var/tmp/diff_new_pack.I6zNlz/_old 2021-08-20 16:58:22.446827924 +0200 +++ /var/tmp/diff_new_pack.I6zNlz/_new 2021-08-20 16:58:22.446827924 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-taskw # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: Development/Languages/Python URL: https://github.com/ralphbean/taskw Source: https://files.pythonhosted.org/packages/source/t/taskw/taskw-%{version}.tar.gz +# PATCH-FIX-UPSTREAM taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch https://github.com/ralphbean/taskw/compare/81f703bac941be74149d0297ea102afba11efdc8...0fa72d2656a5d220a105aad5d880ab7fb57a49cd.diff +Patch0: taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -49,6 +51,7 @@ %prep %setup -q -n taskw-%{version} +%patch0 -p1 %build %python_build ++++++ taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch ++++++ --- a/taskw/test/test_datas.py +++ b/taskw/test/test_datas.py @@ -383,7 +383,7 @@ class TestDBShellout(_BaseTestDB): self.tw.task_add("foobar2") self.tw.task_add("foobar+") tasks = self.tw.filter_tasks({ - 'description.contains': 'foobar+', + 'description.contains': '"foobar+"', }) assert len(tasks) == 1 assert tasks[0]['id'] == 3 @@ -393,7 +393,7 @@ class TestDBShellout(_BaseTestDB): self.tw.task_add("foobar2") self.tw.task_add("foobar-") tasks = self.tw.filter_tasks({ - 'description.contains': 'foobar-', + 'description.contains': '"foobar-"', }) assert len(tasks) == 1 assert tasks[0]['id'] == 3 @@ -451,7 +451,7 @@ class TestDBShellout(_BaseTestDB): self.tw.task_add("foobar2") self.tw.task_add("foo/bar") tasks = self.tw.filter_tasks({ - 'description.contains': 'foo/bar', + 'description.contains': '"foo/bar"', }) assert len(tasks) == 1 assert tasks[0]['id'] == 3 --- a/taskw/warrior.py +++ b/taskw/warrior.py @@ -412,10 +412,13 @@ class TaskWarriorShellout(TaskWarriorBas and https://github.com/ralphbean/taskw/issues/30 for more. """ DEFAULT_CONFIG_OVERRIDES = { + # 'verbose' must be the first param. Otherwise due to + # https://github.com/GothenburgBitFactory/taskwarrior/issues/1953 + # adding tasks will not work in taskwarrior 2.5.3. + 'verbose': 'nothing', 'json': { 'array': 'TRUE' }, - 'verbose': 'nothing', 'confirmation': 'no', 'dependency': { 'confirmation': 'no', @@ -773,6 +776,8 @@ class TaskWarriorShellout(TaskWarriorBas task_to_modify.pop('uuid', None) task_to_modify.pop('id', None) + # Urgency field is auto-generated and cannot be modified. + task_to_modify.pop('urgency', None) # Only handle annotation differences if this is an old-style # task, or if the task itself says annotations have changed.
