python-more-itertools.spec

@@ -1,22 +1,31 @@
 Name:           python-more-itertools
-Version:        9.1.0
-Release:        1
+Version:        4.1.0
+Release:        5
 Summary:        An opensource python library wrapping around itertools
 License:        MIT
 URL:            https://github.com/erikrose/more-itertools
 Source0:        https://pypi.io/packages/source/m/more-itertools/more-itertools-%{version}.tar.gz
 BuildArch:      noarch
+Patch0000:      python37.patch
 
 %description
 This is a python library for efficient use of itertools utility, which also \
 includes implementations of the recipes from the itertools documentation.\
 See https://pythonhosted.org/more-itertools/index.html for more information.
 
+%package -n python2-more-itertools
+Summary:        An opensource python library wrapping around itertools
+BuildRequires:  python2-devel python2-six
+%{?python_provide:%python_provide python2-more-itertools}
+
+%description -n python2-more-itertools
+This is a python library for efficient use of itertools utility, which also \
+includes implementations of the recipes from the itertools documentation.\
+See https://pythonhosted.org/more-itertools/index.html for more information.
+
 %package -n python3-more-itertools
 Summary:        An opensource python library wrapping around itertools
 BuildRequires:  python3-devel python3-six
-BuildRequires:  python3-pip python3-wheel
-BuildRequires:  python3-flit-core
 %{?python_provide:%python_provide python3-more-itertools}
 
 %description -n python3-more-itertools
@@ -28,32 +37,29 @@ See https://pythonhosted.org/more-itertools/index.html for more information.
 %autosetup -n more-itertools-%{version} -p1
 
 %build
-%pyproject_build
+%py2_build
+%py3_build
 
 %install
-%pyproject_install
+%py2_install
+%py3_install
 
 %check
-export PYTHONPATH=%{buildroot}%{python3_sitelib}
-%{__python3} -m unittest -v
+%{__python2} ./setup.py test
+%{__python3} ./setup.py test
+
+%files -n python2-more-itertools
+%doc README.rst PKG-INFO LICENSE
+%{python2_sitelib}/more_itertools/
+%exclude %{python2_sitelib}/more_itertools/tests
+%{python2_sitelib}/more_itertools-%{version}-py%{python2_version}.egg-info
 
 %files -n python3-more-itertools
-%doc README.rst LICENSE
+%doc README.rst PKG-INFO LICENSE
 %{python3_sitelib}/more_itertools/
-%{python3_sitelib}/more_itertools-%{version}*-info
+%exclude %{python3_sitelib}/more_itertools/tests
+%{python3_sitelib}/more_itertools-%{version}-py%{python3_version}.egg-info
 
 %changelog
-* Wed Jun 07 2023 yaoxin <yao_xin001@hoperun.com> - 9.1.0-1
-- Update to 9.1.0
-
-* Thu Jul 7 2022 wulei <wulei80@h-partners.com> - 8.12.0-1
-- Upgrade to 8.12.0
-
-* Thu Jul 15 2021 huangtianhua <huangtianhua@huawei.com> -8.5.0-1
-- Upgrade to 8.5.0 to support OpenStack-W
-
-* Wed Oct 21 2020 Ge Wang <wangge20@huawei.com> - 4.1.0-6
-- remove python2
-
 * Fri Nov 15 2019 sunguoshuai <sunguoshuai@huawei.com> - 4.1.0-5
 - Package init

python-more-itertools.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: more-itertools/more-itertools
-tag_prefix: ^v
-seperator: .

python37.patch

@@ -0,0 +1,40 @@
+From e38574428c952b143fc4e0e42cb99b242c7b7977 Mon Sep 17 00:00:00 2001
+From: Irmen de Jong <irmen@razorvine.net>
+Date: Tue, 3 Apr 2018 19:43:08 +0200
+Subject: [PATCH] fix bucket iteration; adhere to Pep 479. Required for Python
+ 3.7 which is now also included in the test matrix
+
+---
+ more_itertools/more.py | 5 ++++-
+ setup.py               | 2 ++
+ 4 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/more_itertools/more.py b/more_itertools/more.py
+index c4b08ae..ca413a7 100644
+--- a/more_itertools/more.py
++++ b/more_itertools/more.py
+@@ -723,7 +723,10 @@ def _get_values(self, value):
+             # a matching item, caching the rest.
+             else:
+                 while True:
+-                    item = next(self._it)
++                    try:
++                        item = next(self._it)
++                    except StopIteration:
++                        return
+                     item_value = self._key(item)
+                     if item_value == value:
+                         yield item
+diff --git a/setup.py b/setup.py
+index c4670dd..e6fd01b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -51,6 +51,8 @@ def get_long_description():
+         'Programming Language :: Python :: 3.3',
+         'Programming Language :: Python :: 3.4',
+         'Programming Language :: Python :: 3.5',
++        'Programming Language :: Python :: 3.6',
++        'Programming Language :: Python :: 3.7',
+         'Topic :: Software Development :: Libraries'],
+     keywords=['itertools', 'iterator', 'iteration', 'filter', 'peek',
+               'peekable', 'collate', 'chunk', 'chunked'],