Hello community,
here is the log from the commit of package python-jaraco.itertools for
openSUSE:Factory checked in at 2019-03-04 09:21:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jaraco.itertools (Old)
and /work/SRC/openSUSE:Factory/.python-jaraco.itertools.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jaraco.itertools"
Mon Mar 4 09:21:27 2019 rev:2 rq:679744 version:4.4.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jaraco.itertools/python-jaraco.itertools.changes
2018-03-16 10:40:13.003240593 +0100
+++
/work/SRC/openSUSE:Factory/.python-jaraco.itertools.new.28833/python-jaraco.itertools.changes
2019-03-04 09:21:28.716589068 +0100
@@ -1,0 +2,43 @@
+Tue Feb 26 09:32:46 UTC 2019 - John Vandenberg <[email protected]>
+
+- Remove bcond_with test, allowing tests suite to run
+- Add LICENSE
+- Compile manually due to switch to pkgutil namespace technique
+- Set minimum version more-itertools >= 4.0.0
+- Update to v4.4.1
+ * Fixed issue in ``collate_revs`` when objects being merged were non-True
+- from 4.4
+ * Add ``collate_revs`` and ``partition_dict``
+- from 4.3
+ * Nicer error message in ``assert_ordered`` when the assertion fails.
+ Now reports the full supplied items and not just the keys in the errors.
+ When ``<`` or ``>`` are used, the error message renders more directly.
+- from 4.2
+ * The ``duplicates`` function now takes an arbitrary number of iterables
+ * Added ``assert_ordered`` function
+- from 4.1
+ * Added ``duplicates`` function
+- from 4.0.0
+ * Switch to pkgutil namespace technique for the ``jaraco`` namespace
+- from 3.0.0
+ * Refreshed project metadata, now built using declarative config.
+ Installation from sdist now requires setuptools 34.4.
+- from 2.5.2
+ * Fix deprecation warning in ``always_iterable``
+ * Leverage base_type parameter in ``more_itertools.always_iterable``
+- from 2.5.1
+ * Set stacklevel in deprecated functions for better visibility of the call.
+- from 2.5
+ * Added new ``maybe_single`` function
+ * Deprecated ``list_or_iterable`` in favor of ``maybe_single``
+- from 2.4
+ * Deprecated ``flatten`` and ``iflatten`` in favor of
+ ``more_itertools.collapse``. Deprecated ``iterable_test``,
+ only used by deprecated functions.
+ * Bump dependency on more_itertools 4.0.0.
+- from 2.3
+ * Added ``self_product``.
+- from 2.2
+ * ``first`` now accepts a default value, same as ``next``.
+
+-------------------------------------------------------------------
Old:
----
jaraco.itertools-2.0.1.tar.gz
New:
----
jaraco.itertools-4.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jaraco.itertools.spec ++++++
--- /var/tmp/diff_new_pack.TDYikf/_old 2019-03-04 09:21:29.308588962 +0100
+++ /var/tmp/diff_new_pack.TDYikf/_new 2019-03-04 09:21:29.312588961 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-jaraco.itertools
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,36 +12,31 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with test
Name: python-jaraco.itertools
-Version: 2.0.1
+Version: 4.4.1
Release: 0
Summary: Tools to work with iterables
License: MIT
Group: Development/Languages/Python
Url: https://github.com/jaraco/jaraco.itertools
Source0:
https://files.pythonhosted.org/packages/source/j/jaraco.itertools/jaraco.itertools-%{version}.tar.gz
-BuildRequires: %{python_module base}
-BuildRequires: %{python_module jaraco.base}
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module setuptools_scm}
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
-%if %{with test}
BuildRequires: %{python_module inflect}
-BuildRequires: %{python_module more-itertools}
-BuildRequires: %{python_module pytest-runner}
+BuildRequires: %{python_module jaraco.base >= 6.1}
+BuildRequires: %{python_module more-itertools >= 4.0.0}
BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools_scm >= 1.15.0}
+BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
-%endif
-Requires: python-jaraco.base
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
Requires: python-inflect
-Requires: python-more-itertools
+Requires: python-jaraco.base >= 6.1
+Requires: python-more-itertools >= 4.0.0
Requires: python-six
BuildArch: noarch
@@ -53,26 +48,28 @@
%prep
%setup -q -n jaraco.itertools-%{version}
-sed -i -e "s/'pytest_runner'/'pytest-runner'/" setup.py
-rm -rf jaraco.itertools.egg-info
+sed -i 's/--flake8//' pytest.ini
%build
%python_build
%install
%python_install
-# We aren't using the nspkg approach anymore
-%{python_expand rm -r
%{buildroot}%{$python_sitelib}/jaraco.itertools-%{version}-py*-nspkg.pth
+
+%{python_expand rm -f %{buildroot}%{$python_sitelib}/jaraco/__init__.py* \
+ %{buildroot}%{$python_sitelib}/jaraco/__pycache__/__init__.*
+$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/jaraco/
+$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/jaraco/
%fdupes %{buildroot}%{$python_sitelib}
}
-%if %{with test}
%check
-%python_expand py.test-%{$python_bin_suffix}
-%endif
+%{python_expand py.test-%{$python_bin_suffix} \
+ --ignore=_build.python2 --ignore=_build.python3
+}
%files %{python_files}
-%defattr(-,root,root)
+%license LICENSE
%doc docs/*.rst README.rst CHANGES.rst
%{python_sitelib}/jaraco.itertools-%{version}-py*.egg-info
%{python_sitelib}/jaraco/itertools.py*
++++++ jaraco.itertools-2.0.1.tar.gz -> jaraco.itertools-4.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/.flake8
new/jaraco.itertools-4.4.1/.flake8
--- old/jaraco.itertools-2.0.1/.flake8 1970-01-01 01:00:00.000000000 +0100
+++ new/jaraco.itertools-4.4.1/.flake8 2019-01-10 18:16:14.000000000 +0100
@@ -0,0 +1,8 @@
+[flake8]
+ignore =
+ # Allow tabs for indentation
+ W191
+ # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+ W503
+ # W504 has issues
https://github.com/OCA/maintainer-quality-tools/issues/545
+ W504
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/.readthedocs.yml
new/jaraco.itertools-4.4.1/.readthedocs.yml
--- old/jaraco.itertools-2.0.1/.readthedocs.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/jaraco.itertools-4.4.1/.readthedocs.yml 2019-01-10 18:16:14.000000000
+0100
@@ -0,0 +1,5 @@
+python:
+ version: 3
+ extra_requirements:
+ - docs
+ pip_install: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/.travis.yml
new/jaraco.itertools-4.4.1/.travis.yml
--- old/jaraco.itertools-2.0.1/.travis.yml 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/.travis.yml 2019-01-10 18:16:14.000000000
+0100
@@ -1,24 +1,34 @@
+dist: xenial
sudo: false
language: python
+
python:
- 2.7
- 3.6
+- &latest_py3 3.7
+
+jobs:
+ fast_finish: true
+ include:
+ - stage: deploy
+ if: tag IS present
+ python: *latest_py3
+ before_script: skip
+ env:
+ - TWINE_USERNAME=jaraco
+ # TWINE_PASSWORD
+ - secure:
FTmYX2EXGGaF3DoRMG/UwROlc7+Anzkf6olcKGpucTtZKLFaoId+RdYqayM3LGkBffQn0DcnUxdfcLrYfud0K878OpIdQlVMBw8bkvuIRNoKPRLbj7AmCRiyLaUtxADR9nxWXG5JNWjEpyS4scPCh4kwZCWMV74Z0LfMN3MF1Iq7MpSprdRVG1+e3QH9A3ECnpo8cX7jjZoykgeG/Wa0m0Gm4MLfFijfx1JGnEOsRGAb6Bnsp2oBjlzvpXVBDL4ebAu/COZM2HuDI/3YMbdYofC9Pm5r8/vRM/hKlYx1NlrTXHnTou9TWWvezn3AFfq1D+abBxRFApu+j2W2S6/5hic2A433qw3gfphj73l70eER25slgiFVD4NON9G6koFKfcqE1iVxMCHhyXer8sxOStNADEPE7pbj8H2uWLEWwnfs9/q+hxv3+cuBWGaz0ZrN+l5QHJVfReNNGXmvLNPfbsQYQfKItO+vsQtNhzhYLS6V7eUGcq/J4VkjDWyzjSOaHeH07vGuWM5R7p2+aTY/wM4+zW3iNF4oA0Kwiy1k3UQSUSogKrbvF8eqi978syePm8oq2YBs+9oJ1EjlfX20RW+HjNGNqCtngsvERGqJw0QEelJVuTRe88fo3Iw4/zdj3rwhPSSLV0wBkFjBybDbH4bfnCa4vQGB6Bz93kwkIFQ=
+ - TOX_TESTENV_PASSENV="TWINE_USERNAME TWINE_PASSWORD"
+ script: tox -e release
+
+cache: pip
+
install:
-- pip install tox "setuptools>=28.2"
-script:
-- tox
-branches:
- except:
- - skeleton
-deploy:
- provider: pypi
- server: https://upload.pypi.org/legacy/
- on:
- tags: true
- all_branches: true
- python: 3.6
- user: jaraco
- distributions: dists
- skip_upload_docs: true
- password:
- secure:
shK8GEX9tEBfC0h/NoQfz/36AQOXL4U9a4Bl8NxiOJRNcnJpyFjHHPFKc8lzZ9McVltRqAMbdPWqkqOQquuTjM+dTaD5S+DxDnJU0lJbatrHE4gS8jMoJKLotYX/NRup72vzYQyXq1QjMNSf1lrVf8ASqaaUlMwubKUQd0D1OmY57/3CGbqhSnrmhZ5aSwZ7sy289Gk9Il06VXpqhJ6rBiCVtYJdPccu6oYBidE7KH0VhEC132wA8G8onT2jc22CSGpwIrtR8IQxL/B9d4ycAUulpMCXM0a77I5pWpJO8minPBKQD6TWwt3hsn6e1DoKv6gpSOZg4BYD4vxmNVby2vAxwNu0AaQxCdT5i2q6ow2EdCX2G7FN587pbCNKMqZi7CNCxqqE0gO0MacXl6LoP8Om08FIzxytDMDj1Qk+dHr8GAy9dS+iiAARpY47q/uNDQ6MuNvMCrzyjfBmLpmTm6xnkoSFEwTY1d4vjo7QMzzSXbIt/JxiH9ZFD3TtZnbNNZAok7IpRLz7tKMkslsH9DfI5E3/L4+36UNZgsMXc9FyOkkGOS6UphWoKipGfd7A6nMgMTBD8tJ7KdP28266ecvI/W0DGRoRikKkWhPX7U/NA6mLmva0NiOFuMSNXwbvJVYlzZyIp1xG0ERuxUoj9suVBn+hPLn4SoN4PQbthdM=
+- pip install tox tox-venv
+
+before_script:
+ # Disable IPv6. Ref travis-ci/travis-ci#8361
+ - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+ sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
+ fi
+script: tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/CHANGES.rst
new/jaraco.itertools-4.4.1/CHANGES.rst
--- old/jaraco.itertools-2.0.1/CHANGES.rst 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/CHANGES.rst 2019-01-10 18:16:14.000000000
+0100
@@ -1,3 +1,100 @@
+4.4.1
+=====
+
+Fixed issue in ``collate_revs`` when objects being merged were
+non-True.
+
+4.4
+===
+
+Add ``collate_revs`` and ``partition_dict``.
+
+4.3
+===
+
+Nicer error message in ``assert_ordered`` when the assertion
+fails. Now reports the full supplied items and not just the keys
+in the errors. When ``<`` or ``>`` are used, the error message
+renders more directly.
+
+4.2
+===
+
+The ``duplicates`` function now takes an arbitrary number of iterables.
+
+Added ``assert_ordered`` function.
+
+4.1
+===
+
+Added ``duplicates`` function.
+
+4.0.0
+=====
+
+Switch to `pkgutil namespace technique
+<https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages>`_
+for the ``jaraco`` namespace.
+
+3.0.0
+=====
+
+* Refreshed project metadata, now built using declarative
+ config. Installation from sdist now requries setuptools
+ 34.4.
+
+2.5.2
+=====
+
+* Fix deprecation warning in ``always_iterable``.
+* Leverage base_type parameter in
+ ``more_itertools.always_iterable``.
+
+2.5.1
+=====
+
+* Set stacklevel in deprecated functions for better
+ visibility of the call.
+
+2.5
+===
+
+* Added new ``maybe_single`` function.
+* Deprecated ``list_or_iterable`` in favor of
+ ``maybe_single``.
+
+2.4
+===
+
+* Deprecated ``flatten`` and ``iflatten`` in favor of
+ ``more_itertools.collapse``. Deprecated
+ ``iterable_test``, only used by deprecated functions.
+
+* Bump dependency on more_itertools 4.0.0.
+
+2.3
+===
+
+* Added ``self_product``.
+
+2.2
+===
+
+* ``first`` now accepts a default value, same as ``next``.
+
+2.1.1
+=====
+
+* #3: Fix failures on Python 3.7 due to the introduction of
+ PEP 479.
+
+2.1
+===
+
+* Use ``more_itertools.more.always_iterable`` in place
+ of ``always_iterable`` except when a mapping is
+ included.
+
2.0.1
=====
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/LICENSE
new/jaraco.itertools-4.4.1/LICENSE
--- old/jaraco.itertools-2.0.1/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/jaraco.itertools-4.4.1/LICENSE 2019-01-10 18:16:14.000000000 +0100
@@ -0,0 +1,7 @@
+Copyright Jason R. Coombs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/PKG-INFO
new/jaraco.itertools-4.4.1/PKG-INFO
--- old/jaraco.itertools-2.0.1/PKG-INFO 2017-02-09 21:46:22.000000000 +0100
+++ new/jaraco.itertools-4.4.1/PKG-INFO 2019-01-10 18:16:34.000000000 +0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: jaraco.itertools
-Version: 2.0.1
+Version: 4.4.1
Summary: jaraco.itertools
Home-page: https://github.com/jaraco/jaraco.itertools
Author: Jason R. Coombs
@@ -11,18 +11,14 @@
.. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg
- .. image:: https://img.shields.io/pypi/dm/jaraco.itertools.svg
-
.. image::
https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg
- :target: http://travis-ci.org/jaraco/jaraco.itertools
-
+ :target: https://travis-ci.org/jaraco/jaraco.itertools
- License
- =======
+ .. .. image::
https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg
+ .. :target:
https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master
- License is indicated in the project metadata (typically one or more
- of the Trove classifiers). For more details, see `this explanation
- <https://github.com/jaraco/skeleton/issues/1>`_.
+ .. image::
https://readthedocs.org/projects/jaracoitertools/badge/?version=latest
+ :target:
https://jaracoitertools.readthedocs.io/en/latest/?badge=latest
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -30,3 +26,6 @@
Classifier: License :: OSI Approved :: MIT License
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Requires-Python: >=2.7
+Provides-Extra: testing
+Provides-Extra: docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/README.rst
new/jaraco.itertools-4.4.1/README.rst
--- old/jaraco.itertools-2.0.1/README.rst 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/README.rst 2019-01-10 18:16:14.000000000
+0100
@@ -3,15 +3,11 @@
.. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg
-.. image:: https://img.shields.io/pypi/dm/jaraco.itertools.svg
-
.. image:: https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg
- :target: http://travis-ci.org/jaraco/jaraco.itertools
-
+ :target: https://travis-ci.org/jaraco/jaraco.itertools
-License
-=======
+.. .. image::
https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg
+.. :target:
https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master
-License is indicated in the project metadata (typically one or more
-of the Trove classifiers). For more details, see `this explanation
-<https://github.com/jaraco/skeleton/issues/1>`_.
+.. image::
https://readthedocs.org/projects/jaracoitertools/badge/?version=latest
+ :target: https://jaracoitertools.readthedocs.io/en/latest/?badge=latest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/appveyor.yml
new/jaraco.itertools-4.4.1/appveyor.yml
--- old/jaraco.itertools-2.0.1/appveyor.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/jaraco.itertools-4.4.1/appveyor.yml 2019-01-10 18:16:14.000000000
+0100
@@ -0,0 +1,24 @@
+environment:
+
+ APPVEYOR: true
+
+ matrix:
+ - PYTHON: "C:\\Python36-x64"
+ - PYTHON: "C:\\Python27-x64"
+
+install:
+ # symlink python from a directory with a space
+ - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
+ - "SET PYTHON=\"C:\\Program Files\\Python\""
+ - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+build: off
+
+cache:
+ - '%LOCALAPPDATA%\pip\Cache'
+
+test_script:
+ - "python -m pip install tox tox-venv"
+ - "tox"
+
+version: '{build}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/conftest.py
new/jaraco.itertools-4.4.1/conftest.py
--- old/jaraco.itertools-2.0.1/conftest.py 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/conftest.py 2019-01-10 18:16:14.000000000
+0100
@@ -10,7 +10,6 @@
return
broken_test_names = [
'jaraco.itertools.always_iterable',
- 'jaraco.itertools.flatten',
]
items[:] = (
item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/docs/conf.py
new/jaraco.itertools-4.4.1/docs/conf.py
--- old/jaraco.itertools-2.0.1/docs/conf.py 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/docs/conf.py 2019-01-10 18:16:14.000000000
+0100
@@ -1,58 +1,30 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-import os
-import sys
-import subprocess
-import datetime
+extensions = ["sphinx.ext.autodoc", "jaraco.packaging.sphinx", "rst.linker"]
-if 'check_output' not in dir(subprocess):
- import subprocess32 as subprocess
-
-extensions = [
- 'sphinx.ext.autodoc',
- 'rst.linker',
-]
-
-# General information about the project.
-
-root = os.path.join(os.path.dirname(__file__), '..')
-setup_script = os.path.join(root, 'setup.py')
-fields = ['--name', '--version', '--url', '--author']
-dist_info_cmd = [sys.executable, setup_script] + fields
-output_bytes = subprocess.check_output(dist_info_cmd, cwd=root)
-project, version, url, author =
output_bytes.decode('utf-8').strip().split('\n')
-
-origin_date = datetime.date(2005,1,1)
-today = datetime.date.today()
-
-copyright = '{origin_date.year}-{today.year} {author}'.format(**locals())
-
-# The full version, including alpha/beta/rc tags.
-release = version
-
-master_doc = 'index'
+master_doc = "index"
link_files = {
- '../CHANGES.rst': dict(
- using=dict(
- GH='https://github.com',
- project=project,
- url=url,
- ),
- replace=[
- dict(
- pattern=r"(Issue )?#(?P<issue>\d+)",
- url='{url}/issues/{issue}',
- ),
- dict(
-
pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
- with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
- ),
- dict(
- pattern=r"PEP[- ](?P<pep_number>\d+)",
-
url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
- ),
- ],
- ),
+ "../CHANGES.rst": dict(
+ using=dict(GH="https://github.com";),
+ replace=[
+ dict(
+ pattern=r"(Issue #|\B#)(?P<issue>\d+)",
+ url="{package_url}/issues/{issue}",
+ ),
+ dict(
+ pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
+ with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+ ),
+ dict(
+ pattern=r"PEP[- ](?P<pep_number>\d+)",
+ url="https://www.python.org/dev/peps/pep-{pep_number:0>4}/",
+ ),
+ dict(
+ pattern=r"more_itertools (?P<more_itertools_ver>[0-9.]+)",
+
url="https://more-itertools.readthedocs.io/en/latest/versions.html";, # noqa:
E501
+ ),
+ ],
+ ),
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/docs/requirements.txt
new/jaraco.itertools-4.4.1/docs/requirements.txt
--- old/jaraco.itertools-2.0.1/docs/requirements.txt 2017-02-09
21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/docs/requirements.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-rst.linker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/jaraco/__init__.py
new/jaraco.itertools-4.4.1/jaraco/__init__.py
--- old/jaraco.itertools-2.0.1/jaraco/__init__.py 2017-02-09
21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco/__init__.py 2019-01-10
18:16:14.000000000 +0100
@@ -1 +1 @@
-__import__("pkg_resources").declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/jaraco/itertools.py
new/jaraco.itertools-4.4.1/jaraco/itertools.py
--- old/jaraco.itertools-2.0.1/jaraco/itertools.py 2017-02-09
21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco/itertools.py 2019-01-10
18:16:14.000000000 +0100
@@ -14,12 +14,16 @@
import warnings
import functools
+try:
+ import collections.abc
+except ImportError:
+ collections.abc = collections
+
import six
from six.moves import queue, xrange as range
import inflect
-from more_itertools import more
-from more_itertools import recipes
+import more_itertools
def make_rows(num_columns, seq):
@@ -37,11 +41,12 @@
if partial:
num_rows += 1
# break the seq into num_columns of length num_rows
- result = recipes.grouper(num_rows, seq)
+ result = more_itertools.grouper(num_rows, seq)
# result is now a list of columns... transpose it to return a list
# of rows
return zip(*result)
+
def bisect(seq, func=bool):
"""
Split a sequence into two sequences: the first is elements that
@@ -66,6 +71,7 @@
queues = GroupbySaved(seq, func)
return queues.get_first_n_queues(2)
+
class GroupbySaved(object):
"""
Split a sequence into n sequences where n is determined by the
@@ -99,7 +105,8 @@
>>> next(ones)
4
"""
- def __init__(self, sequence, func = lambda x: x):
+
+ def __init__(self, sequence, func=lambda x: x):
self.sequence = iter(sequence)
self.func = func
self.queues = collections.OrderedDict()
@@ -120,7 +127,7 @@
def __find_queue__(self, key):
"search for the queue indexed by key"
try:
- while not key in self.queues:
+ while key not in self.queues:
self.__fetch__()
return self.queues[key]
except StopIteration:
@@ -142,6 +149,7 @@
values.extend(iter([]) for n in range(missing))
return values
+
class FetchingQueue(queue.Queue):
"""
A FIFO Queue that is supplied with a function to inject more into
@@ -157,6 +165,7 @@
tuple(q) just copies the elements in the list (of which there are
none).
"""
+
def __init__(self, fetcher):
if six.PY3:
super(FetchingQueue, self).__init__()
@@ -172,11 +181,15 @@
def __iter__(self):
while True:
- yield next(self)
+ try:
+ yield next(self)
+ except StopIteration:
+ return
def enqueue(self, item):
self.put_nowait(item)
+
class Count(object):
"""
A stop object that will count how many times it's been called and return
@@ -208,6 +221,7 @@
If all you need is the count of items, consider :class:`Counter`
instead.
"""
+
def __init__(self, limit):
self.count = 0
self.limit = limit if limit is not None else float('Inf')
@@ -245,6 +259,7 @@
>>> print(islice(3, 10, 2))
every 2nd item from 3 to 9
"""
+
def __init__(self, *sliceArgs):
self.sliceArgs = sliceArgs
@@ -259,7 +274,10 @@
return result
def _formatArgs(self):
- slice_range = lambda a_b: '%d to %d' % (a_b[0], a_b[1] - 1)
+
+ def slice_range(a_b):
+ return '%d to %d' % (a_b[0], a_b[1] - 1)
+
if len(self.sliceArgs) == 1:
result = 'at most %d' % self.sliceArgs
if len(self.sliceArgs) == 2:
@@ -270,6 +288,7 @@
result = 'every %(ord)s item from %(range)s' % locals()
return result
+
class LessThanNBlanks(object):
"""
An object that when called will return True until n false elements
@@ -278,7 +297,8 @@
Can be used with filter or itertools.ifilter, for example:
>>> import itertools
- >>> sampleData = ['string 1', 'string 2', '', 'string 3', '', 'string
4', '', '', 'string 5']
+ >>> sampleData = ['string 1', 'string 2', '', 'string 3', '',
+ ... 'string 4', '', '', 'string 5']
>>> first = itertools.takewhile(LessThanNBlanks(2), sampleData)
>>> tuple(first)
('string 1', 'string 2', '', 'string 3')
@@ -286,6 +306,7 @@
>>> tuple(first)
('string 1', 'string 2', '', 'string 3', '', 'string 4')
"""
+
def __init__(self, nBlanks):
self.limit = nBlanks
self.count = 0
@@ -296,6 +317,7 @@
raise ValueError("Should not call this object anymore.")
return self.count < self.limit
+
class LessThanNConsecutiveBlanks(object):
"""
An object that when called will return True until n consecutive
@@ -304,7 +326,8 @@
Can be used with filter or itertools.ifilter, for example:
>>> import itertools
- >>> sampleData = ['string 1', 'string 2', '', 'string 3', '', 'string
4', '', '', 'string 5']
+ >>> sampleData = ['string 1', 'string 2', '', 'string 3', '', 'string
4',
+ ... '', '', 'string 5']
>>> first = itertools.takewhile(LessThanNConsecutiveBlanks(2),
sampleData)
>>> tuple(first)
('string 1', 'string 2', '', 'string 3', '', 'string 4', '')
@@ -324,6 +347,7 @@
raise ValueError("Should not call this object anymore.")
return self.count < self.limit
+
class splitter(object):
"""
object that will split a string with the given arguments for each call.
@@ -332,7 +356,8 @@
>>> list(s('hello, world, this is your, master calling'))
['hello', ' world', ' this is your', ' master calling']
"""
- def __init__(self, sep = None):
+
+ def __init__(self, sep=None):
self.sep = sep
def __call__(self, s):
@@ -346,6 +371,7 @@
yield s[lastIndex:]
break
+
def grouper_nofill_str(n, iterable):
"""
Take a sequence and break it up into chunks of the specified size.
@@ -365,7 +391,7 @@
>>> tuple(grouper_nofill_str(3, list(range(10))))
([0, 1, 2], [3, 4, 5], [6, 7, 8], [9])
"""
- res = more.chunked(iterable, n)
+ res = more_itertools.chunked(iterable, n)
if isinstance(iterable, six.string_types):
res = (''.join(item) for item in res)
return res
@@ -401,6 +427,7 @@
>>> items.count
20
"""
+
def __init__(self, i):
self.count = 0
self._orig_iter = iter(i)
@@ -415,24 +442,21 @@
next = __next__
def GetCount(self):
- warnings.warn("Use count attribute directly",
DeprecationWarning)
+ warnings.warn(
+ "Use count attribute directly", DeprecationWarning,
+ stacklevel=2)
return self.count
# todo, factor out caching capability
-class iterable_test(dict):
- """
- Test objects for iterability, caching the result by type
- >>> test = iterable_test()
- >>> test['foo']
- False
- >>> test[[]]
- True
- """
- def __init__(self, ignore_classes=six.string_types+(six.binary_type,)):
+
+class iterable_test(dict):
+ def __init__(self, ignore_classes=six.string_types +
(six.binary_type,)):
"""ignore_classes must include str, because if a string
is iterable, so is a single character, and the routine runs
into an infinite recursion"""
+ warnings.warn(
+ "Slated for removal", DeprecationWarning, stacklevel=2)
assert set(six.string_types) <= set(ignore_classes), (
'str must be in ignore_classes')
self.ignore_classes = ignore_classes
@@ -451,6 +475,7 @@
self[type(candidate)] = result
return result
+
def iflatten(subject, test=None):
if test is None:
test = iterable_test()
@@ -461,27 +486,17 @@
for subelem in iflatten(elem, test):
yield subelem
+
def flatten(subject, test=None):
"""
- Flatten an iterable with possible nested iterables.
-
- Adapted from
- http://mail.python.org/pipermail/python-list/2003-November/233971.html
-
- >>> flatten(['a','b',['c','d',['e','f'],'g'],'h'])
- ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']
-
- Note this will normally ignore string types as iterables.
-
- >>> flatten(['ab', 'c'])
- ['ab', 'c']
-
- Same for bytes
-
- >>> flatten([b'ab', b'c'])
- [b'ab', b'c']
+ *Deprecated*: Use more_itertools.collapse instead.
"""
- return list(iflatten(subject, test))
+ warnings.warn(
+ "Use more_itertools.collapse instead",
+ DeprecationWarning,
+ stacklevel=2)
+ return list(more_itertools.collapse(subject, base_type=(bytes,)))
+
def empty():
"""
@@ -489,6 +504,7 @@
"""
return iter(tuple())
+
def is_empty(iterable):
"""
Return whether the iterable is empty or not. Consumes at most one item
@@ -505,6 +521,7 @@
return True
return False
+
class Reusable(object):
"""
An iterator that may be reset and reused.
@@ -527,7 +544,8 @@
self.__saved = iterable
self.reset()
- def __iter__(self): return self
+ def __iter__(self):
+ return self
def reset(self):
"""
@@ -547,6 +565,7 @@
raise
next = __next__
+
def every_other(iterable):
"""
Yield every other item from the iterable
@@ -556,8 +575,12 @@
"""
items = iter(iterable)
while True:
- yield next(items)
- next(items)
+ try:
+ yield next(items)
+ next(items)
+ except StopIteration:
+ return
+
def remove_duplicates(iterable, key=None):
"""
@@ -577,6 +600,7 @@
itertools.groupby(iterable, key)
)))
+
def skip_first(iterable):
"""
Skip the first element of an iterable
@@ -586,6 +610,7 @@
"""
return itertools.islice(iterable, 1, None)
+
def peek(iterable):
"""
Get the next value from an iterable, but also return an iterable
@@ -602,6 +627,7 @@
peeker, original = itertools.tee(iterable)
return next(peeker), original
+
class Peekable(object):
"""
Wrapper for a traditional iterable to give it a peek attribute.
@@ -672,7 +698,7 @@
yield next(iterable)
-def first(iterable):
+def first(iterable, *args):
"""
Return the first item from the iterable.
@@ -684,9 +710,21 @@
>>> first(iter)
0
+ Raises StopIteration if no value is present.
+
+ >>> first([])
+ Traceback (most recent call last):
+ ...
+ StopIteration
+
+ Pass a default to be used when iterable is empty.
+
+ >>> first([], None)
+
"""
iterable = iter(iterable)
- return next(iterable)
+ return next(iterable, *args)
+
def last(iterable):
"""
@@ -706,6 +744,7 @@
except NameError:
raise ValueError("Iterable contains no items")
+
def one(item):
"""
Return the first element from the iterable, but raise an exception
@@ -735,6 +774,7 @@
result, = item
return result
+
def nwise(iter, n):
"""
Like pairwise, except returns n-tuples of adjacent items.
@@ -746,6 +786,7 @@
next(iterset[-1], None)
return six.moves.zip(*iterset)
+
def window(iter, pre_size=1, post_size=1):
"""
Given an iterable, return a new iterable which yields triples of
@@ -773,6 +814,7 @@
next(post_iter, None)
return six.moves.zip(pre_iter, iter, post_iter)
+
class IterSaver(object):
def __init__(self, n, iterable):
self.n = n
@@ -785,6 +827,7 @@
return self.buffer.popleft()
next = __next__
+
def partition_items(count, bin_size):
"""
Given the total number of items, determine the number of items that
@@ -808,6 +851,7 @@
bins[i % num_bins] += 1
return bins
+
def balanced_rows(n, iterable, fillvalue=None):
"""
Like grouper, but balance the rows to minimize fill per row.
@@ -821,6 +865,7 @@
row = itertools.chain(row, [fillvalue])
yield tuple(row)
+
def reverse_lists(lists):
"""
>>> reverse_lists([[1,2,3], [4,5,6]])
@@ -829,6 +874,7 @@
return list(map(list, map(reversed, lists)))
+
def always_iterable(item):
"""
Given an object, always return an iterable. If the item is not
@@ -836,13 +882,13 @@
None, an empty iterable is returned.
>>> always_iterable([1,2,3])
- [1, 2, 3]
+ <list_iterator...>
>>> always_iterable('foo')
- ('foo',)
+ <tuple_iterator...>
>>> always_iterable(None)
- ()
+ <tuple_iterator...>
>>> always_iterable(range(10))
- range(0, 10)
+ <range_iterator...>
>>> def _test_func(): yield "I'm iterable"
>>> print(next(always_iterable(_test_func())))
I'm iterable
@@ -850,17 +896,12 @@
Although mappings are iterable, treat each like a singleton, as
it's more like an object than a sequence.
- >>> always_iterable(dict(a=1))
- ({'a': 1},)
+ >>> next(always_iterable(dict(a=1)))
+ {'a': 1}
"""
- if item is None:
- item = ()
- singleton = (
- isinstance(item, six.string_types)
- or isinstance(item, collections.Mapping)
- or not hasattr(item, '__iter__')
- )
- return (item,) if singleton else item
+ base_types = six.text_type, bytes, collections.abc.Mapping
+ return more_itertools.always_iterable(item, base_type=base_types)
+
def suppress_exceptions(callables, *exceptions):
"""
@@ -885,6 +926,7 @@
except exceptions:
pass
+
def apply(func, iterable):
"""
Like 'map', invoking func on each item in the iterable,
@@ -906,16 +948,280 @@
def list_or_single(iterable):
- """
- Given an iterable, return the items as a list. If the iterable contains
- exactly one item, return that item. Correlary function to always_iterable.
-
- >>> list_or_single(iter('abcd'))
- ['a', 'b', 'c', 'd']
- >>> list_or_single(['a'])
- 'a'
- """
- result = list(iterable)
- if len(result) == 1:
- result = result[0]
- return result
+ """
+ Given an iterable, return the items as a list. If the iterable contains
+ exactly one item, return that item. Correlary function to
always_iterable.
+ """
+ warnings.warn("Use maybe_single", DeprecationWarning, stacklevel=2)
+ return maybe_single(list(iterable))
+
+
+def maybe_single(sequence):
+ """
+ Given a sequence, if it contains exactly one item,
+ return that item, otherwise return the sequence.
+ Correlary function to always_iterable.
+
+ >>> maybe_single(tuple('abcd'))
+ ('a', 'b', 'c', 'd')
+ >>> maybe_single(['a'])
+ 'a'
+ """
+ try:
+ single, = sequence
+ except ValueError:
+ return sequence
+ return single
+
+
+def self_product(iterable):
+ """
+ Return the cross product of the iterable with itself.
+
+ >>> list(self_product([1, 2, 3]))
+ [(1, 1), (1, 2), ..., (3, 3)]
+ """
+ return itertools.product(*itertools.tee(iterable))
+
+
+def duplicates(*iterables, **kwargs):
+ """
+ Yield duplicate items from any number of sorted iterables of items
+
+ >>> items_a = [1, 2, 3]
+ >>> items_b = [0, 3, 4, 5, 6]
+ >>> list(duplicates(items_a, items_b))
+ [(3, 3)]
+
+ It won't behave as you expect if the iterables aren't ordered
+
+ >>> items_b.append(1)
+ >>> list(duplicates(items_a, items_b))
+ [(3, 3)]
+ >>> list(duplicates(items_a, sorted(items_b)))
+ [(1, 1), (3, 3)]
+
+ This function is most interesting when it's operating on a key
+ of more complex objects.
+
+ >>> items_a = [dict(email='[email protected]', id=1)]
+ >>> items_b = [dict(email='[email protected]', id=2),
dict(email='other')]
+ >>> dupe, = duplicates(items_a, items_b,
key=operator.itemgetter('email'))
+ >>> dupe[0]['email'] == dupe[1]['email'] == '[email protected]'
+ True
+ >>> dupe[0]['id']
+ 1
+ >>> dupe[1]['id']
+ 2
+ """
+ key = kwargs.pop('key', lambda x: x)
+ assert not kwargs
+ zipped = more_itertools.collate(*iterables, key=key)
+ grouped = itertools.groupby(zipped, key=key)
+ groups = (
+ tuple(g)
+ for k, g in grouped
+ )
+
+ def has_dupes(group):
+ return len(group) > 1
+ return filter(has_dupes, groups)
+
+
+def assert_ordered(iterable, key=lambda x: x, comp=operator.le):
+ """
+ Assert that for all items in the iterable, they're in order based on
comp
+
+ >>> list(assert_ordered(range(5)))
+ [0, 1, 2, 3, 4]
+ >>> list(assert_ordered(range(5), comp=operator.ge))
+ Traceback (most recent call last):
+ ...
+ AssertionError: 0 < 1
+ >>> list(assert_ordered(range(5, 0, -1), key=operator.neg))
+ [5, 4, 3, 2, 1]
+ """
+ err_tmpl = (
+ "{pair[0]} > {pair[1]}" if comp is operator.le else
+ "{pair[0]} < {pair[1]}" if comp is operator.ge else
+ "not {comp} {pair}"
+ )
+ for pair in more_itertools.pairwise(iterable):
+ keyed = tuple(map(key, pair))
+ assert comp(*keyed), err_tmpl.format(**locals())
+ yield pair[0]
+ yield pair[1]
+
+
+def collate_revs(old, new, key=lambda x: x, merge=lambda old, new: new):
+ """
+ Given revision sets old and new, each containing a series
+ of revisions of some set of objects, collate them based on
+ these rules:
+
+ - all items from each set are yielded in stable order
+ - items in old are yielded first
+ - items in new are yielded last
+ - items that match are yielded in the order in which they
+ appear, giving preference to new
+
+ Items match based on the 'key' parameter (identity by default).
+
+ Items are merged using the 'merge' function, which accepts the old
+ and new items to be merged (returning new by default).
+
+ This algorithm requires fully materializing both old and new in memory.
+
+ >>> rev1 = ['a', 'b', 'c']
+ >>> rev2 = ['a', 'd', 'c']
+ >>> result = list(collate_revs(rev1, rev2))
+
+ 'd' must appear before 'c'
+ >>> result.index('d') < result.index('c')
+ True
+
+ 'b' must appear before 'd' because it came chronologically
+ first.
+ >>> result.index('b') < result.index('d')
+ True
+
+ >>> result
+ ['a', 'b', 'd', 'c']
+
+ >>> list(collate_revs(['a', 'b', 'c'], ['d']))
+ ['a', 'b', 'c', 'd']
+
+ >>> list(collate_revs(['b', 'a'], ['a', 'b']))
+ ['a', 'b']
+
+ >>> list(collate_revs(['a', 'c'], ['a', 'b', 'c']))
+ ['a', 'b', 'c']
+
+ Given two sequences of things out of order, regardless
+ of which order in which the items are merged, all
+ keys should always be merged.
+
+ >>> from more_itertools import consume
+ >>> left_items = ['a', 'b', 'c']
+ >>> right_items = ['a', 'c', 'b']
+ >>> consume(collate_revs(left_items, right_items, merge=print))
+ a a
+ c c
+ b b
+ >>> consume(collate_revs(right_items, left_items, merge=print))
+ a a
+ b b
+ c c
+
+ The merge should not suppress non-True items:
+
+ >>> consume(collate_revs([0, 1, 2, None, ''], [0, None, ''],
merge=print))
+ None None
+ <BLANKLINE>
+ 0 0
+
+ """
+ missing = object()
+
+ def maybe_merge(*items):
+ """
+ Merge any non-null items
+ """
+ def not_missing(ob):
+ return ob is not missing
+
+ return functools.reduce(merge, filter(not_missing, items))
+
+ new_items = collections.OrderedDict(
+ (key(el), el)
+ for el in new
+ )
+ old_items = collections.OrderedDict(
+ (key(el), el)
+ for el in old
+ )
+
+ # use the old_items as a reference
+ for old_key, old_item in _mutable_iter(old_items):
+ if old_key not in new_items:
+ yield old_item
+ continue
+
+ # yield all new items that appear before the matching key
+ before, match_new, new_items = _swap_on_miss(
+ partition_dict(new_items, old_key))
+ for new_key, new_item in before.items():
+ # ensure any new keys are merged with previous items if
+ # they exist
+ yield maybe_merge(new_item, old_items.pop(new_key,
missing))
+ yield merge(old_item, match_new)
+
+ # finally, yield whatever is leftover
+ # yield from new_items.values()
+ for item in new_items.values():
+ yield item
+
+
+def _mutable_iter(dict):
+ """
+ Iterate over items in the dict, yielding the first one, but allowing
+ it to be mutated during the process.
+ >>> d = dict(a=1)
+ >>> it = _mutable_iter(d)
+ >>> next(it)
+ ('a', 1)
+ >>> d
+ {}
+ >>> d.update(b=2)
+ >>> list(it)
+ [('b', 2)]
+ """
+ while dict:
+ prev_key = next(iter(dict))
+ yield prev_key, dict.pop(prev_key)
+
+
+def _swap_on_miss(partition_result):
+ """
+ Given a partition_dict result, if the partition missed, swap
+ the before and after.
+ """
+ before, item, after = partition_result
+ return (before, item, after) if item else (after, item, before)
+
+
+def partition_dict(items, key):
+ """
+ Given an ordered dictionary of items and a key in that dict,
+ return an ordered dict of items before, the keyed item, and
+ an ordered dict of items after.
+
+ >>> od = collections.OrderedDict(zip(range(5), 'abcde'))
+ >>> before, item, after = partition_dict(od, 3)
+ >>> before
+ OrderedDict([(0, 'a'), (1, 'b'), (2, 'c')])
+ >>> item
+ 'd'
+ >>> after
+ OrderedDict([(4, 'e')])
+
+ Like string.partition, if the key is not found in the items,
+ the before will contain all items, item will be None, and
+ after will be an empty iterable.
+
+ >>> before, item, after = partition_dict(od, -1)
+ >>> before
+ OrderedDict([(0, 'a'), ..., (4, 'e')])
+ >>> item
+ >>> list(after)
+ []
+ """
+ def unmatched(pair):
+ test_key, item, = pair
+ return test_key != key
+
+ items_iter = iter(items.items())
+ item = items.get(key)
+ left = collections.OrderedDict(itertools.takewhile(unmatched,
items_iter))
+ right = collections.OrderedDict(items_iter)
+ return left, item, right
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/PKG-INFO
new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/PKG-INFO
--- old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/PKG-INFO
2017-02-09 21:46:22.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/PKG-INFO
2019-01-10 18:16:33.000000000 +0100
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: jaraco.itertools
-Version: 2.0.1
+Version: 4.4.1
Summary: jaraco.itertools
Home-page: https://github.com/jaraco/jaraco.itertools
Author: Jason R. Coombs
@@ -11,18 +11,14 @@
.. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg
- .. image:: https://img.shields.io/pypi/dm/jaraco.itertools.svg
-
.. image::
https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg
- :target: http://travis-ci.org/jaraco/jaraco.itertools
-
+ :target: https://travis-ci.org/jaraco/jaraco.itertools
- License
- =======
+ .. .. image::
https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg
+ .. :target:
https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master
- License is indicated in the project metadata (typically one or more
- of the Trove classifiers). For more details, see `this explanation
- <https://github.com/jaraco/skeleton/issues/1>`_.
+ .. image::
https://readthedocs.org/projects/jaracoitertools/badge/?version=latest
+ :target:
https://jaracoitertools.readthedocs.io/en/latest/?badge=latest
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -30,3 +26,6 @@
Classifier: License :: OSI Approved :: MIT License
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Requires-Python: >=2.7
+Provides-Extra: testing
+Provides-Extra: docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/SOURCES.txt
new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/SOURCES.txt
--- old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/SOURCES.txt
2017-02-09 21:46:22.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/SOURCES.txt
2019-01-10 18:16:34.000000000 +0100
@@ -1,21 +1,24 @@
+.flake8
+.readthedocs.yml
.travis.yml
CHANGES.rst
+LICENSE
README.rst
+appveyor.yml
conftest.py
+pyproject.toml
pytest.ini
setup.cfg
setup.py
+skeleton.md
tox.ini
docs/conf.py
docs/history.rst
docs/index.rst
-docs/requirements.txt
jaraco/__init__.py
jaraco/itertools.py
jaraco.itertools.egg-info/PKG-INFO
jaraco.itertools.egg-info/SOURCES.txt
jaraco.itertools.egg-info/dependency_links.txt
-jaraco.itertools.egg-info/namespace_packages.txt
jaraco.itertools.egg-info/requires.txt
-jaraco.itertools.egg-info/top_level.txt
-tests/requirements.txt
\ No newline at end of file
+jaraco.itertools.egg-info/top_level.txt
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/namespace_packages.txt
new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/namespace_packages.txt
--- old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/namespace_packages.txt
2017-02-09 21:46:22.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/namespace_packages.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-jaraco
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/requires.txt
new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/requires.txt
--- old/jaraco.itertools-2.0.1/jaraco.itertools.egg-info/requires.txt
2017-02-09 21:46:22.000000000 +0100
+++ new/jaraco.itertools-4.4.1/jaraco.itertools.egg-info/requires.txt
2019-01-10 18:16:33.000000000 +0100
@@ -1,3 +1,13 @@
six
-more_itertools
+more_itertools>=4.0.0
inflect
+
+[docs]
+sphinx
+jaraco.packaging>=3.2
+rst.linker>=1.9
+
+[testing]
+pytest!=3.7.3,>=3.5
+pytest-checkdocs
+pytest-flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/pyproject.toml
new/jaraco.itertools-4.4.1/pyproject.toml
--- old/jaraco.itertools-2.0.1/pyproject.toml 1970-01-01 01:00:00.000000000
+0100
+++ new/jaraco.itertools-4.4.1/pyproject.toml 2019-01-10 18:16:14.000000000
+0100
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
+build-backend = "setuptools.build_meta"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/pytest.ini
new/jaraco.itertools-4.4.1/pytest.ini
--- old/jaraco.itertools-2.0.1/pytest.ini 2017-02-09 21:45:57.000000000
+0100
+++ new/jaraco.itertools-4.4.1/pytest.ini 2019-01-10 18:16:14.000000000
+0100
@@ -1,4 +1,11 @@
[pytest]
-norecursedirs=dist build .tox
-addopts=--doctest-modules
-doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+norecursedirs=dist build .tox .eggs
+addopts=--doctest-modules --flake8
+doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
+filterwarnings=
+ ignore:Possible nested set::pycodestyle:113
+ ignore:Using or importing the ABCs::flake8:410
+ # workaround for https://sourceforge.net/p/docutils/bugs/348/
+ ignore:'U' mode is deprecated::docutils.io
+ # workaround for https://gitlab.com/pycqa/flake8/issues/275
+ ignore:You passed a bytestring as `filenames`.::flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/setup.cfg
new/jaraco.itertools-4.4.1/setup.cfg
--- old/jaraco.itertools-2.0.1/setup.cfg 2017-02-09 21:46:22.000000000
+0100
+++ new/jaraco.itertools-4.4.1/setup.cfg 2019-01-10 18:16:34.000000000
+0100
@@ -1,12 +1,44 @@
-[aliases]
-release = dists upload
-dists = clean --all sdist bdist_wheel
-
-[wheel]
+[bdist_wheel]
universal = 1
+[metadata]
+license_file = LICENSE
+name = jaraco.itertools
+author = Jason R. Coombs
+author_email = [email protected]
+description = jaraco.itertools
+long_description = file:README.rst
+url = https://github.com/jaraco/jaraco.itertools
+classifiers =
+ Development Status :: 5 - Production/Stable
+ Intended Audience :: Developers
+ License :: OSI Approved :: MIT License
+ Programming Language :: Python :: 2.7
+ Programming Language :: Python :: 3
+
+[options]
+packages = find:
+include_package_data = true
+python_requires = >=2.7
+install_requires =
+ six
+ more_itertools>=4.0.0
+ inflect
+setup_requires = setuptools_scm >= 1.15.0
+
+[options.extras_require]
+testing =
+ pytest >= 3.5, !=3.7.3
+ pytest-checkdocs
+ pytest-flake8
+docs =
+ sphinx
+ jaraco.packaging >= 3.2
+ rst.linker >= 1.9
+
+[options.entry_points]
+
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/setup.py
new/jaraco.itertools-4.4.1/setup.py
--- old/jaraco.itertools-2.0.1/setup.py 2017-02-09 21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/setup.py 2019-01-10 18:16:14.000000000 +0100
@@ -1,47 +1,6 @@
#!/usr/bin/env python
-# Project skeleton maintained at https://github.com/jaraco/skeleton
-
-import io
-
import setuptools
-with io.open('README.rst', encoding='utf-8') as readme:
- long_description = readme.read()
-
-name = 'jaraco.itertools'
-description = ''
-
-params = dict(
- name=name,
- use_scm_version=True,
- author="Jason R. Coombs",
- author_email="[email protected]",
- description=description or name,
- long_description=long_description,
- url="https://github.com/jaraco/"; + name,
- packages=setuptools.find_packages(),
- include_package_data=True,
- namespace_packages=name.split('.')[:-1],
- install_requires=[
- 'six',
- 'more_itertools',
- 'inflect',
- ],
- extras_require={
- },
- setup_requires=[
- 'setuptools_scm>=1.15.0',
- ],
- classifiers=[
- "Development Status :: 5 - Production/Stable",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: MIT License",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3",
- ],
- entry_points={
- },
-)
-if __name__ == '__main__':
- setuptools.setup(**params)
+if __name__ == "__main__":
+ setuptools.setup(use_scm_version=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/skeleton.md
new/jaraco.itertools-4.4.1/skeleton.md
--- old/jaraco.itertools-2.0.1/skeleton.md 1970-01-01 01:00:00.000000000
+0100
+++ new/jaraco.itertools-4.4.1/skeleton.md 2019-01-10 18:16:14.000000000
+0100
@@ -0,0 +1,126 @@
+# Overview
+
+This project is merged with [skeleton](https://github.com/jaraco/skeleton).
What is skeleton? It's the scaffolding of a Python project jaraco [introduced
in his blog](https://blog.jaraco.com/a-project-skeleton-for-python-projects/).
It seeks to provide a means to re-use techniques and inherit advances when
managing projects for distribution.
+
+## An SCM Managed Approach
+
+While maintaining dozens of projects in PyPI, jaraco derives best practices
for project distribution and publishes them in the [skeleton
repo](https://github.com/jaraco/skeleton), a git repo capturing the evolution
and culmination of these best practices.
+
+It's intended to be used by a new or existing project to adopt these practices
and honed and proven techniques. Adopters are encouraged to use the project
directly and maintain a small deviation from the technique, make their own fork
for more substantial changes unique to their environment or preferences, or
simply adopt the skeleton once and abandon it thereafter.
+
+The primary advantage to using an SCM for maintaining these techniques is that
those tools help facilitate the merge between the template and its adopting
projects.
+
+# Usage
+
+## new projects
+
+To use skeleton for a new project, simply pull the skeleton into a new project:
+
+```
+$ git init my-new-project
+$ cd my-new-project
+$ git pull gh://jaraco/skeleton
+```
+
+Now customize the project to suit your individual project needs.
+
+## existing projects
+
+If you have an existing project, you can still incorporate the skeleton by
merging it into the codebase.
+
+```
+$ git merge skeleton --allow-unrelated-histories
+```
+
+The `--allow-unrelated-histories` is necessary because the history from the
skeleton was previously unrelated to the existing codebase. Resolve any merge
conflicts and commit to the master, and now the project is based on the shared
skeleton.
+
+## Updating
+
+Whenever a change is needed or desired for the general technique for
packaging, it can be made in the skeleton project and then merged into each of
the derived projects as needed, recommended before each release. As a result,
features and best practices for packaging are centrally maintained and readily
trickle into a whole suite of packages. This technique lowers the amount of
tedious work necessary to create or maintain a project, and coupled with other
techniques like continuous integration and deployment, lowers the cost of
creating and maintaining refined Python projects to just a few, familiar git
operations.
+
+Thereafter, the target project can make whatever customizations it deems
relevant to the scaffolding. The project may even at some point decide that the
divergence is too great to merit renewed merging with the original skeleton.
This approach applies maximal guidance while creating minimal constraints.
+
+# Features
+
+The features/techniques employed by the skeleton include:
+
+- PEP 517/518 based build relying on setuptools as the build tool
+- setuptools declarative configuration using setup.cfg
+- tox for running tests
+- A README.rst as reStructuredText with some popular badges, but with
readthedocs and appveyor badges commented out
+- A CHANGES.rst file intended for publishing release notes about the project.
+
+## Packaging Conventions
+
+A pyproject.toml is included to enable PEP 517 and PEP 518 compatibility and
declares the requirements necessary to build the project on setuptools (a
minimum version compatible with setup.cfg declarative config).
+
+The setup.cfg file implements the following features:
+
+- Assumes universal wheel for release
+- Advertises the project's LICENSE file (MIT by default)
+- Reads the README.rst file into the long description
+- Some common Trove classifiers
+- Includes all packages discovered in the repo
+- Data files in the package are also included (not just Python files)
+- Declares the required Python versions
+- Declares install requirements (empty by default)
+- Declares setup requirements for legacy environments
+- Supplies two 'extras':
+ - testing: requirements for running tests
+ - docs: requirements for building docs
+ - these extras split the declaration into "upstream" (requirements as
declared by the skeleton) and "local" (those specific to the local project);
these markers help avoid merge conflicts
+- Placeholder for defining entry points
+
+Additionally, the setup.py file declares `use_scm_version` which relies on
[setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things:
+
+- derive the project version from SCM tags
+- ensure that all files committed to the repo are automatically included in
releases
+
+## Running Tests
+
+The skeleton assumes the developer has [tox](https://pypi.org/project/tox)
installed. The developer is expected to run `tox` to run tests on the current
Python version using [pytest](https://pypi.org/project/pytest).
+
+Other environments (invoked with `tox -e {name}`) supplied include:
+
+ - a `build-docs` environment to build the documentation
+ - a `release` environment to publish the package to PyPI
+
+A pytest.ini is included to define common options around running tests. In
particular:
+
+- rely on default test discovery in the current directory
+- avoid recursing into common directories not containing tests
+- run doctests on modules and invoke flake8 tests
+- in doctests, allow unicode literals and regular literals to match, allowing
for doctests to run on Python 2 and 3. Also enable ELLIPSES, a default that
would be undone by supplying the prior option.
+- filters out known warnings caused by libraries/functionality included by the
skeleton
+
+Relies a .flake8 file to correct some default behaviors:
+
+- allow tabs for indentation (legacy for jaraco projects)
+- disable mutually incompatible rules W503 and W504.
+
+## Continuous Integration
+
+The project is pre-configured to run tests in
[Travis-CI](https://travis-ci.org) (.travis.yml). Any new project must be
enabled either through their web site or with the `travis enable` command. In
addition to running tests, an additional deploy stage is configured to
automatically release tagged commits. The username and password for PyPI must
be configured for each project using the `travis` command and only after the
travis project is created. As releases are cut with
[twine](https://pypi.org/project/twine), the two values are supplied through
the `TWINE_USERNAME` and `TWINE_PASSWORD`. To configure the latter as a secret,
run the following command:
+
+```
+echo "TWINE_PASSWORD={password}" | travis encrypt
+```
+
+Or disable it in the CI definition and configure it through the web UI.
+
+Features include:
+- test against Python 2 and 3
+- run on Ubuntu Xenial
+- correct for broken IPv6
+
+Also provided is a minimal template for running under Appveyor (Windows).
+
+## Building Documentation
+
+Documentation is automatically built by [Read the
Docs](https://readthedocs.org) when the project is registered with it, by way
of the .readthedocs.yml file. To test the docs build manually, a tox env may be
invoked as `tox -e build-docs`. Both techniques rely on the dependencies
declared in `setup.cfg/options.extras_require.docs`.
+
+In addition to building the sphinx docs scaffolded in `docs/`, the docs build
a `history.html` file that first injects release dates and hyperlinks into the
CHANGES.rst before incorporating it as history in the docs.
+
+## Cutting releases
+
+By default, tagged commits are released through the continuous integration
deploy stage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/tests/requirements.txt
new/jaraco.itertools-4.4.1/tests/requirements.txt
--- old/jaraco.itertools-2.0.1/tests/requirements.txt 2017-02-09
21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/tests/requirements.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-pytest >= 2.8
-subprocess32; python_version=="2.6"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.itertools-2.0.1/tox.ini
new/jaraco.itertools-4.4.1/tox.ini
--- old/jaraco.itertools-2.0.1/tox.ini 2017-02-09 21:45:57.000000000 +0100
+++ new/jaraco.itertools-4.4.1/tox.ini 2019-01-10 18:16:14.000000000 +0100
@@ -1,6 +1,31 @@
+[tox]
+envlist = python
+minversion = 2.4
+
[testenv]
deps =
- -rtests/requirements.txt
-
-commands = py.test {posargs}
+ setuptools>=31.0.1
+commands =
+ pytest {posargs}
usedevelop = True
+extras = testing
+
+[testenv:build-docs]
+extras =
+ docs
+ testing
+changedir = docs
+commands =
+ python -m sphinx . {toxinidir}/build/html
+
+[testenv:release]
+skip_install = True
+deps =
+ pep517>=0.5
+ # workaround for https://github.com/pypa/twine/issues/423
+ git+https://github.com/pypa/twine
+ path.py
+commands =
+ python -c "import path; path.Path('dist').rmtree_p()"
+ python -m pep517.build .
+ python -m twine upload dist/*
