This commit is contained in:
aarem 2019-05-21 09:51:19 -05:00
parent 27b164c5eb
commit 85ad5bacdb
4 changed files with 11 additions and 77 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/more-itertools-2.2.tar.gz
/more-itertools-2.3.tar.gz
/more-itertools-4.1.0.tar.gz
/more-itertools-7.0.0.tar.gz

View File

@ -9,31 +9,19 @@ See https://pythonhosted.org/more-itertools/index.html for documentation.\
%global sum Python library for efficient use of itertools utility
Name: python-%{srcname}
Version: 4.1.0
Release: 5%{?dist}
Version: 7.0.0
Release: 1%{?dist}
Summary: %{sum}
License: MIT
URL: https://github.com/erikrose/more-itertools
Source0: https://pypi.io/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python2-nose
BuildRequires: python2-six
BuildRequires: python3-devel
BuildRequires: python3-nose
BuildRequires: python3-six
# https://github.com/erikrose/more-itertools/commit/e38574428c952b143fc4e0e42cb99b242c7b7977
Patch0: python37.patch
%description %_description
%package -n python2-%{srcname}
Summary: %{sum}
%{?python_provide:%python_provide python2-%{srcname}}
%description -n python2-%{srcname} %_description
%package -n python3-%{srcname}
Summary: %{sum}
%{?python_provide:%python_provide python3-%{srcname}}
@ -41,27 +29,17 @@ Summary: %{sum}
%description -n python3-%{srcname} %_description
%prep
%autosetup -n %{srcname}-%{version} -p1
%autosetup -n %{srcname}-%{version}
%build
%py2_build
%py3_build
%install
%py2_install
%py3_install
%check
%{__python2} ./setup.py test
%{__python3} ./setup.py test
%files -n python2-%{srcname}
%license LICENSE
%doc README.rst PKG-INFO
%{python2_sitelib}/more_itertools/
%exclude %{python2_sitelib}/more_itertools/tests
%{python2_sitelib}/more_itertools-%{version}-py%{python2_version}.egg-info
%files -n python3-%{srcname}
%license LICENSE
%doc README.rst PKG-INFO
@ -70,21 +48,16 @@ Summary: %{sum}
%{python3_sitelib}/more_itertools-%{version}-py%{python3_version}.egg-info
%changelog
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue May 21 2019 aarem AT fedoraproject DOT org - 7.0.0-1
- Update to 7.0.0
- Drop python-2
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1.0-3
- Rebuilt for Python 3.7
* Tue May 22 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1.0-2
- Backport upstream fix for Python 3.7
* Sun Apr 01 2018 aarem AT fedoraproject DOT org - 4.1.0-1
- rebuit for 4.1.0 using Thomas Moschny modification to spec file
* Sat Mar 24 2018 Thomas Moschny <thomas.moschny@gmx.de> - 4.1.0-1
- Update to 4.1.0.
- Do not package tests.
- Do not do package tests.
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,40 +0,0 @@
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'],

View File

@ -1 +1 @@
SHA512 (more-itertools-4.1.0.tar.gz) = a4ab4f8f74fba8d8e5762a9d8cff7c837d47f2cdc178f86cb4e94b898d3c690bc70b94d1bc4a3500809ae77f457c2fb880721945b8f5f0220aeb374938769a2d
SHA512 (more-itertools-7.0.0.tar.gz) = 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5