Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-acitoolkit for
openSUSE:Factory checked in at 2022-02-03 23:16:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-acitoolkit (Old)
and /work/SRC/openSUSE:Factory/.python-acitoolkit.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-acitoolkit"
Thu Feb 3 23:16:36 2022 rev:4 rq:951350 version:0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-acitoolkit/python-acitoolkit.changes
2019-04-01 12:35:34.825833316 +0200
+++
/work/SRC/openSUSE:Factory/.python-acitoolkit.new.1898/python-acitoolkit.changes
2022-02-03 23:17:31.536187186 +0100
@@ -1,0 +2,19 @@
+Thu Feb 3 14:07:10 UTC 2022 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fix install dependencies of -doc-applications and -doc-samples:
+ make them rely on the primary python interpreter version.
+
+-------------------------------------------------------------------
+Tue Feb 1 07:10:38 UTC 2022 - pgaj...@suse.com
+
+- use spec cleaner, remove redundant Provides
+
+-------------------------------------------------------------------
+Fri Jan 28 10:10:09 UTC 2022 - pgaj...@suse.com
+
+- fix for python 3.10
+- added patches
+ fix
https://github.com/datacenter/acitoolkit/commit/629b84887dd0f0183b81efc8adb16817f985541a
+ + python-acitoolkit-python-310.patch
+
+-------------------------------------------------------------------
New:
----
python-acitoolkit-python-310.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-acitoolkit.spec ++++++
--- /var/tmp/diff_new_pack.Ru3ZAl/_old 2022-02-03 23:17:32.136183090 +0100
+++ /var/tmp/diff_new_pack.Ru3ZAl/_new 2022-02-03 23:17:32.140183063 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-acitoolkit
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,9 +23,11 @@
Summary: Python library for programming ACI
License: Apache-2.0
Group: Development/Languages/Python
-URL: http://github.com/datacenter/acitoolkit
+URL: https://github.com/datacenter/acitoolkit
Source:
https://github.com/datacenter/acitoolkit/archive/v%{version}.tar.gz
Patch0: remove-app-dependency.patch
+#
https://github.com/datacenter/acitoolkit/commit/629b84887dd0f0183b81efc8adb16817f985541a
+Patch1: python-acitoolkit-python-310.patch
BuildRequires: %{python_module graphviz}
BuildRequires: %{python_module jsonschema}
BuildRequires: %{python_module mock}
@@ -52,25 +54,23 @@
%package -n %{name}-doc
Summary: Documentation for the Python acitoolkit library
Group: Documentation/Other
-Provides: %{python_module acitoolkit-doc = %{version}}
%description -n %{name}-doc
-Documentation for %name.
+Documentation for %{name}.
%package -n %{name}-doc-applications
Summary: Applications for the Python acitoolkit library
Group: Development/Languages/Python
-Provides: %{python_module acitoolkit-doc-applications = %{version}}
-Requires: %{name}-doc
-Requires: python-Flask
-Requires: python-Flask-Admin
-Requires: python-Flask-Bootstrap
-Requires: python-Flask-Cors
-Requires: python-Flask-HTTPAuth
-Requires: python-Flask-SQLAlchemy
-Requires: python-Flask-WTF
-Requires: python-GitPython
-Requires: python-py-radix
+Requires: python-acitoolkit-doc
+Requires: python3-Flask
+Requires: python3-Flask-Admin
+Requires: python3-Flask-Bootstrap
+Requires: python3-Flask-Cors
+Requires: python3-Flask-HTTPAuth
+Requires: python3-Flask-SQLAlchemy
+Requires: python3-Flask-WTF
+Requires: python3-GitPython
+Requires: python3-py-radix
%description -n %{name}-doc-applications
Python applications using acitoolkit for programming ACI.
@@ -78,9 +78,8 @@
%package -n %{name}-doc-samples
Summary: Sample code for the Python acitoolkit library
Group: Development/Languages/Python
-Provides: %{python_module acitoolkit-doc-samples = %{version}}
Requires: %{name}-doc
-Requires: python-PyMySQL
+Requires: python3-PyMySQL
%description -n %{name}-doc-samples
Python samples for using acitoolkit for programming ACI.
@@ -89,6 +88,7 @@
%setup -q -n acitoolkit-%{version}
# Remove dependencies of applications/ and samples/ from the library
%patch0 -p1
+%patch1 -p1
chmod -x LICENSE NOTICE
@@ -111,27 +111,27 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
# Install docs, samples and applications into a common doc area
-install -d %{buildroot}%_defaultdocdir/%{name}
-cp -rp docs/source/*.rst docs/source/*.png docs/source/stats/ samples/
applications/ %{buildroot}%_defaultdocdir/%{name}/
-find %{buildroot}%_defaultdocdir/%{name}/ -type f -exec chmod a-x \{\} \;
+install -d %{buildroot}%{_defaultdocdir}/%{name}
+cp -rp docs/source/*.rst docs/source/*.png docs/source/stats/ samples/
applications/ %{buildroot}%{_defaultdocdir}/%{name}/
+find %{buildroot}%{_defaultdocdir}/%{name}/ -type f -exec chmod a-x \{\} \;
-%fdupes %{buildroot}%_defaultdocdir/%{name}/
+%fdupes %{buildroot}%{_defaultdocdir}/%{name}/
%check
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python
tests/acitoolkit_test.py offline
%files -n %{name}-doc
%license LICENSE NOTICE
-%dir %_defaultdocdir/%{name}
-%_defaultdocdir/%{name}/*.rst
-%_defaultdocdir/%{name}/*.png
-%_defaultdocdir/%{name}/stats/
+%dir %{_defaultdocdir}/%{name}
+%{_defaultdocdir}/%{name}/*.rst
+%{_defaultdocdir}/%{name}/*.png
+%{_defaultdocdir}/%{name}/stats/
%files -n %{name}-doc-samples
-%_defaultdocdir/%{name}/samples/
+%{_defaultdocdir}/%{name}/samples/
%files -n %{name}-doc-applications
-%_defaultdocdir/%{name}/applications/
+%{_defaultdocdir}/%{name}/applications/
%files %{python_files}
%doc README.md
++++++ python-acitoolkit-python-310.patch ++++++
diff --git a/acitoolkit/acitoolkit.py b/acitoolkit/acitoolkit.py
index 3c4b0f61..495bf690 100755
--- a/acitoolkit/acitoolkit.py
+++ b/acitoolkit/acitoolkit.py
@@ -30,7 +30,13 @@
""" Main ACI Toolkit module
This is the main module that comprises the ACI Toolkit.
"""
-from collections import Sequence
+try:
+ # Python <=3.9
+ from collections import Sequence
+except ImportError:
+ # Python > 3.8
+ from collections.abc import Sequence
+
import logging
from operator import attrgetter, itemgetter
import re
