Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-ssdeep for openSUSE:Factory checked in at 2022-11-12 17:41:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ssdeep (Old) and /work/SRC/openSUSE:Factory/.python-ssdeep.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ssdeep" Sat Nov 12 17:41:13 2022 rev:8 rq:1035278 version:3.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ssdeep/python-ssdeep.changes 2021-12-14 22:02:48.775169023 +0100 +++ /work/SRC/openSUSE:Factory/.python-ssdeep.new.1597/python-ssdeep.changes 2022-11-12 17:41:34.742314400 +0100 @@ -1,0 +2,16 @@ +Fri Nov 11 13:09:00 UTC 2022 - [email protected] + +- silent rpmlint + +------------------------------------------------------------------- +Fri Nov 11 12:41:42 UTC 2022 - [email protected] + +- version update to 3.4.1 + * Add internal build improvements + * Update CI pipelines +- do not require python-six +- added patches + fix https://github.com/DinoTools/python-ssdeep/commit/6cf96d63e9512fa14b6557d0d8afaa5128e0e853 + + python-ssdeep-no-six.patch + +------------------------------------------------------------------- Old: ---- python-ssdeep-3.4.tar.gz New: ---- python-ssdeep-3.4.1.tar.gz python-ssdeep-no-six.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ssdeep.spec ++++++ --- /var/tmp/diff_new_pack.3DLLsC/_old 2022-11-12 17:41:36.502324877 +0100 +++ /var/tmp/diff_new_pack.3DLLsC/_new 2022-11-12 17:41:36.506324901 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-ssdeep # -# Copyright (c) 2021 SUSE LLC +# 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 @@ -16,10 +16,9 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-ssdeep -Version: 3.4 +Version: 3.4.1 Release: 0 Summary: Python wrapper for the ssdeep library License: LGPL-3.0-or-later @@ -27,15 +26,15 @@ URL: https://github.com/DinoTools/python-ssdeep #Source: https://files.pythonhosted.org/packages/source/s/ssdeep/ssdeep-%%{version}.tar.gz # no docs here, see https://github.com/DinoTools/python-ssdeep/issues/37 Source: https://github.com/DinoTools/python-ssdeep/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/DinoTools/python-ssdeep/commit/6cf96d63e9512fa14b6557d0d8afaa5128e0e853 +Patch0: python-ssdeep-no-six.patch BuildRequires: %{python_module cffi >= 0.8.6} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: libfuzzy-devel BuildRequires: python-rpm-macros Requires: python-cffi -Requires: python-six Requires: ssdeep # SECTION tests BuildRequires: %{python_module pytest} @@ -49,6 +48,7 @@ %prep %setup -q -n python-ssdeep-%{version} +%patch0 -p1 # https://github.com/DinoTools/python-ssdeep/issues/57 sed -i 's:"pytest-runner.*"::' setup.py @@ -63,7 +63,8 @@ %pytest_arch %files %{python_files} -%{python_sitearch}/* +%{python_sitearch}/ssdeep +%{python_sitearch}/ssdeep-*egg-info %doc README.rst CHANGELOG.rst %license LICENSE ++++++ python-ssdeep-3.4.tar.gz -> python-ssdeep-3.4.1.tar.gz ++++++ ++++ 1746 lines of diff (skipped) ++++++ python-ssdeep-no-six.patch ++++++ diff --git a/setup.py b/setup.py index 3a32b13..c99d33d 100755 --- a/setup.py +++ b/setup.py @@ -182,11 +182,9 @@ def get_objects(): keywords="ssdeep", install_requires=[ "cffi>=1.0.0", - "six>=1.4.1", ], setup_requires=[ "cffi>=1.0.0", - "six>=1.4.1", ] + setup_requires, tests_require=[ "pytest", diff --git a/src/ssdeep/__init__.py b/src/ssdeep/__init__.py index 5735d51..7aaf884 100644 --- a/src/ssdeep/__init__.py +++ b/src/ssdeep/__init__.py @@ -5,8 +5,6 @@ import os -import six - # Ignore flake8 F401 warning for unused vars from ssdeep.__about__ import ( # noqa: F401 __author__, __copyright__, __email__, __license__, __summary__, __title__, @@ -104,10 +102,10 @@ def update(self, buf, encoding="utf-8"): if self._state == ffi.NULL: raise InternalError("State object is NULL") - if isinstance(buf, six.text_type): + if isinstance(buf, str): buf = buf.encode(encoding) - if not isinstance(buf, six.binary_type): + if not isinstance(buf, bytes): raise TypeError( "Argument must be of string, unicode or bytes type not " "'%r'" % type(buf) @@ -179,10 +177,10 @@ def update(self, buf, encoding="utf-8"): """ - if isinstance(buf, six.text_type): + if isinstance(buf, str): buf = buf.encode(encoding) - if not isinstance(buf, six.binary_type): + if not isinstance(buf, bytes): raise TypeError( "Argument must be of string, unicode or bytes type not " "'%r'" % type(buf) @@ -222,18 +220,18 @@ def compare(sig1, sig2): """ - if isinstance(sig1, six.text_type): + if isinstance(sig1, str): sig1 = sig1.encode("ascii") - if isinstance(sig2, six.text_type): + if isinstance(sig2, str): sig2 = sig2.encode("ascii") - if not isinstance(sig1, six.binary_type): + if not isinstance(sig1, bytes): raise TypeError( "First argument must be of string, unicode or bytes type not " "'%s'" % type(sig1) ) - if not isinstance(sig2, six.binary_type): + if not isinstance(sig2, bytes): raise TypeError( "Second argument must be of string, unicode or bytes type not " "'%r'" % type(sig2) @@ -258,10 +256,10 @@ def hash(buf, encoding="utf-8"): """ - if isinstance(buf, six.text_type): + if isinstance(buf, str): buf = buf.encode(encoding) - if not isinstance(buf, six.binary_type): + if not isinstance(buf, bytes): raise TypeError( "Argument must be of string, unicode or bytes type not " "'%r'" % type(buf)
