commit 52209f9eaa24c496c3064923de28ea308f6afdfe
Author: Jan Palus <at...@pld-linux.org>
Date: Fri Jun 23 21:47:29 2023 +0200
up to 5.1.8
etm-dgraham.spec | 6 ++----
tinydb-compat.patch | 31 -------------------------------
2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/etm-dgraham.spec b/etm-dgraham.spec
index be6ad8f..ff80b77 100644
--- a/etm-dgraham.spec
+++ b/etm-dgraham.spec
@@ -1,12 +1,11 @@
Summary: Event and task manager
Name: etm-dgraham
-Version: 5.1.4
+Version: 5.1.8
Release: 1
License: GPL
Group: Applications/Text
Source0:
https://files.pythonhosted.org/packages/source/e/etm-dgraham/%{name}-%{version}.tar.gz
-# Source0-md5: 2b67de9ef007dcbd562b063d67f1220d
-Patch0: tinydb-compat.patch
+# Source0-md5: 84c442a7f15455df30119188daaceb94
URL: https://dagraham.github.io/etm-dgraham/
BuildRequires: python3 >= 1:3.7.3
BuildRequires: python3-modules >= 1:3.7.3
@@ -24,7 +23,6 @@ Knife of tools for managing reminders.
%prep
%setup -q
-%patch0 -p1
%build
%py3_build
diff --git a/tinydb-compat.patch b/tinydb-compat.patch
deleted file mode 100644
index ab5bc39..0000000
--- a/tinydb-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 54132324878f2d47c134c201fd27206cffcfcfea Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpa...@fastmail.com>
-Date: Thu, 22 Jun 2023 12:58:44 +0200
-Subject: [PATCH] Fix compatibility with tinydb < 4.0.0
-
-tinydb 4.0.0 extracted Document/Table classes from database to table
-module
----
- etm/model.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/etm/model.py b/etm/model.py
-index ee8badf..a1479f9 100755
---- a/etm/model.py
-+++ b/etm/model.py
-@@ -41,7 +41,11 @@ import sys
- import re
-
- from tinydb import __version__ as tinydb_version
--from tinydb.table import Document
-+from packaging.version import parse as parse_version
-+if parse_version(tinydb_version) >= parse_version("4.0.0"):
-+ from tinydb.table import Document
-+else:
-+ from tinydb.database import Document
-
- from jinja2 import Template
- from jinja2 import __version__ as jinja2_version
---
-2.41.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/etm-dgraham.git/commitdiff/52209f9eaa24c496c3064923de28ea308f6afdfe
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
