Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-aexpect for openSUSE:Factory checked in at 2022-10-20 11:11:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-aexpect (Old) and /work/SRC/openSUSE:Factory/.python-aexpect.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-aexpect" Thu Oct 20 11:11:30 2022 rev:5 rq:1030032 version:1.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-aexpect/python-aexpect.changes 2022-01-10 23:53:06.056777916 +0100 +++ /work/SRC/openSUSE:Factory/.python-aexpect.new.2275/python-aexpect.changes 2022-10-20 11:11:55.596045811 +0200 @@ -1,0 +2,8 @@ +Wed Oct 19 16:18:45 UTC 2022 - Daniel Garcia <daniel.gar...@suse.com> + +- Add 0001-Remove-six-dependency.patch upstream patch to remove python-six + dependency gh#avocado-framework/aexpect#102 +- More specific python_sitelib in files +- Use autosetup instead of setup and autopatch + +------------------------------------------------------------------- New: ---- 0001-Remove-six-dependency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-aexpect.spec ++++++ --- /var/tmp/diff_new_pack.nnttOL/_old 2022-10-20 11:11:56.260047156 +0200 +++ /var/tmp/diff_new_pack.nnttOL/_new 2022-10-20 11:11:56.280047197 +0200 @@ -27,15 +27,15 @@ URL: http://avocado-framework.readthedocs.org/ Source: https://github.com/avocado-framework/aexpect/archive/%{version}.tar.gz#/%{pkgname}-%{version}.tar.gz Patch0: helper-version-in-cmdline.patch +# PATCH-FIX-UPSTREAM 0001-Remove-six-dependency.patch gh#avocado-framework/aexpect#102 +Patch1: 0001-Remove-six-dependency.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires(post): update-alternatives Requires(postun):update-alternatives -Requires: python-six BuildArch: noarch %python_subpackages @@ -45,8 +45,7 @@ sftp, telnet, among others. %prep -%setup -q -n %{pkgname}-%{version} -%autopatch -p1 +%autosetup -p1 -n %{pkgname}-%{version} %build %python_build @@ -70,6 +69,7 @@ %license LICENSE %doc README.rst %python_alternative %{_bindir}/aexpect_helper -%{python_sitelib}/* +%{python_sitelib}/aexpect +%{python_sitelib}/aexpect-%{version}*-info %changelog ++++++ 0001-Remove-six-dependency.patch ++++++ >From 8782bcf28750247b35f5c7d994b8bd9558cd3c04 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Moreno <daniel.gar...@suse.com> Date: Wed, 19 Oct 2022 18:06:27 +0200 Subject: [PATCH] Remove six dependency Fix #83 --- aexpect/rss_client.py | 8 +++----- setup.py | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/aexpect/rss_client.py b/aexpect/rss_client.py index 0e7ebd3..a818da9 100644 --- a/aexpect/rss_client.py +++ b/aexpect/rss_client.py @@ -33,8 +33,6 @@ import os import glob import argparse -import six - # Globals CHUNKSIZE = 65536 @@ -260,17 +258,17 @@ class FileTransferClient: def _handle_transfer_error(self): # Save original exception - error = sys.exc_info() + (_type, error, traceback) = sys.exc_info() try: # See if we can get an error message msg = self._receive_msg() except FileTransferError: # No error message -- re-raise original exception - six.reraise(*error) + raise error.with_traceback(traceback) if msg == RSS_ERROR: errmsg = self._receive_packet().decode() raise FileTransferServerError(errmsg) - six.reraise(*error) + raise error.with_traceback(traceback) class FileUploadClient(FileTransferClient): diff --git a/setup.py b/setup.py index 405dd87..8870846 100644 --- a/setup.py +++ b/setup.py @@ -27,5 +27,4 @@ if __name__ == '__main__': packages=['aexpect', 'aexpect.utils'], scripts=['scripts/aexpect_helper'], - test_suite='tests', - install_requires=['six']) + test_suite='tests') -- 2.38.0
