From 47fa2d62ea59e77936684f6d284c22a80cd20d9ecec982813f51201a78bb52f8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 16 Feb 2022 20:11:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-taskw?expand=0&rev=7 --- ...3.0-fix-build-with-taskwarrior-2.5.2.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch diff --git a/taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch b/taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch deleted file mode 100644 index cea545c..0000000 --- a/taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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.