14
0
forked from pool/python-taskw

Accepting request 955484 from devel:languages:python

- update to 1.3.1:
  * Adds support for Taskwarrior 2.6.0
  * Fixes changelog syntax
  * Add tests for pull requests
- drop taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/955484
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-taskw?expand=0&rev=4
This commit is contained in:
2022-02-16 23:31:17 +00:00
committed by Git OBS Bridge
5 changed files with 14 additions and 63 deletions

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Feb 16 20:10:57 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1.3.1:
* Adds support for Taskwarrior 2.6.0
* Fixes changelog syntax
* Add tests for pull requests
- drop taskw-1.3.0-fix-build-with-taskwarrior-2.5.2.patch (upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 20 07:58:12 UTC 2021 - Fusion Future <qydwhotmail@gmail.com> Fri Aug 20 07:58:12 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-taskw # spec file for package python-taskw
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-taskw Name: python-taskw
Version: 1.3.0 Version: 1.3.1
Release: 0 Release: 0
Summary: Python bindings for taskwarrior Summary: Python bindings for taskwarrior
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Development/Languages/Python Group: Development/Languages/Python
URL: https://github.com/ralphbean/taskw URL: https://github.com/ralphbean/taskw
Source: https://files.pythonhosted.org/packages/source/t/taskw/taskw-%{version}.tar.gz 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: %{python_module setuptools}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
@@ -51,7 +49,6 @@ Python bindings for your taskwarrior database.
%prep %prep
%setup -q -n taskw-%{version} %setup -q -n taskw-%{version}
%patch0 -p1
%build %build
%python_build %python_build

View File

@@ -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.

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb
size 43078

3
taskw-1.3.1.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a68e49cac2d4f6da73c0ce554fd6f94932d95e20596f2ee44a769a28c12ba7d
size 43381