Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-Logbook for openSUSE:Factory
checked in at 2023-06-28 21:33:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Logbook (Old)
and /work/SRC/openSUSE:Factory/.python-Logbook.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Logbook"
Wed Jun 28 21:33:13 2023 rev:9 rq:1095703 version:1.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Logbook/python-Logbook.changes
2021-05-12 19:31:20.071260084 +0200
+++ /work/SRC/openSUSE:Factory/.python-Logbook.new.13546/python-Logbook.changes
2023-06-28 21:33:13.589812844 +0200
@@ -1,0 +2,9 @@
+Wed Jun 28 03:27:42 UTC 2023 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Add patch deal-with-missing-socket.patch
+- Pin SQLAlchemy < 2, this requires 1.4
+- Stop using greedy globs in %files
+- Light spring cleaning of the spec file.
+- Refresh patch from GitHub, the short shas gained one character.
+
+-------------------------------------------------------------------
New:
----
deal-with-missing-socket.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Logbook.spec ++++++
--- /var/tmp/diff_new_pack.3i7rKa/_old 2023-06-28 21:33:15.833826094 +0200
+++ /var/tmp/diff_new_pack.3i7rKa/_new 2023-06-28 21:33:15.841826141 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-Logbook
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without python2
Name: python-Logbook
Version: 1.5.3
Release: 0
@@ -27,10 +25,11 @@
Source:
https://files.pythonhosted.org/packages/source/L/Logbook/Logbook-%{version}.tar.gz
# PATCH-FIX-UPSTREAM logbook-pr316-sqlalchemy-count.patch --
gh#getlogbook/logbook#316
Patch1:
https://github.com/getlogbook/logbook/pull/316.patch#/logbook-pr316-sqlalchemy-count.patch
+Patch2: deal-with-missing-socket.patch
BuildRequires: %{python_module Brotli}
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module Jinja2}
-BuildRequires: %{python_module SQLAlchemy}
+BuildRequires: %{python_module SQLAlchemy < 2}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module execnet >= 1.0.9}
BuildRequires: %{python_module gevent}
@@ -46,14 +45,11 @@
BuildRequires: redis
BuildRequires: util-linux
Recommends: python-Jinja2
-Recommends: python-SQLAlchemy
+Recommends: python-SQLAlchemy < 2
Recommends: python-execnet >= 1.0.9
Recommends: python-gevent
Recommends: python-pyzmq
Recommends: python-redis
-%if %{with python2}
-BuildRequires: python-mock
-%endif
%python_subpackages
%description
@@ -84,6 +80,7 @@
%files %{python_files}
%license LICENSE
%doc CHANGES
-%{python_sitearch}/*
+%{python_sitearch}/logbook
+%{python_sitearch}/Logbook-%{version}-*-info
%changelog
++++++ deal-with-missing-socket.patch ++++++
Index: Logbook-1.5.3/logbook/queues.py
===================================================================
--- Logbook-1.5.3.orig/logbook/queues.py
+++ Logbook-1.5.3/logbook/queues.py
@@ -229,7 +229,8 @@ class ZeroMQHandler(Handler):
self.export_record(record)).encode("utf-8"))
def close(self, linger=-1):
- self.socket.close(linger)
+ if hasattr(self, 'socket'):
+ self.socket.close(linger)
def __del__(self):
# When the Handler is deleted we must close our socket in a
++++++ logbook-pr316-sqlalchemy-count.patch ++++++
--- /var/tmp/diff_new_pack.3i7rKa/_old 2023-06-28 21:33:15.881826377 +0200
+++ /var/tmp/diff_new_pack.3i7rKa/_new 2023-06-28 21:33:15.885826401 +0200
@@ -8,7 +8,7 @@
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/logbook/ticketing.py b/logbook/ticketing.py
-index 7321fa3..4f94ab8 100644
+index 7321fa32..4f94ab8e 100644
--- a/logbook/ticketing.py
+++ b/logbook/ticketing.py
@@ -243,7 +243,10 @@ def record_ticket(self, record, data, hash, app_id):
