August 2022 - openSUSE Commits - openSUSE Mailing Lists

commit ccache for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ccache for openSUSE:Factory checked in at 2022-08-31 18:08:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccache (Old) and /work/SRC/openSUSE:Factory/.ccache.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ccache" Wed Aug 31 18:08:37 2022 rev:67 rq:1000203 version:4.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ccache/ccache.changes 2022-06-06 11:09:57.619258800 +0200 +++ /work/SRC/openSUSE:Factory/.ccache.new.2083/ccache.changes 2022-08-31 18:08:41.971329662 +0200 @@ -1,0 +2,5 @@ +Tue Aug 30 04:03:21 UTC 2022 - Bernhard Wiedemann <bwiedemann(a)suse.com> + +- Add fix2038.patch to make tests pass after 2038 + +------------------------------------------------------------------- New: ---- fix2038.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccache.spec ++++++ --- /var/tmp/diff_new_pack.nUtilc/_old 2022-08-31 18:08:42.575331261 +0200 +++ /var/tmp/diff_new_pack.nUtilc/_new 2022-08-31 18:08:42.583331282 +0200 @@ -25,6 +25,9 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{ver… Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{ver… Source2: %{name}.keyring +%ifnarch %ix86 %arm +Patch0: fix2038.patch +%endif BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libzstd-devel >= 1.1.2 ++++++ fix2038.patch ++++++ Index: ccache-4.6.1/test/suites/direct.bash =================================================================== --- ccache-4.6.1.orig/test/suites/direct.bash +++ ccache-4.6.1/test/suites/direct.bash @@ -883,7 +883,7 @@ EOF cat <<EOF >new.h int test; EOF - touch -t 203801010000 new.h + touch -t 999901010000 new.h $CCACHE_COMPILE -c new.c expect_stat direct_cache_hit 0

1 0

commit mariadb-connector-c for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mariadb-connector-c for openSUSE:Factory checked in at 2022-08-31 18:08:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb-connector-c (Old) and /work/SRC/openSUSE:Factory/.mariadb-connector-c.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb-connector-c" Wed Aug 31 18:08:36 2022 rev:39 rq:1000194 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb-connector-c/mariadb-connector-c.changes 2022-07-09 16:59:46.308502321 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb-connector-c.new.2083/mariadb-connector-c.changes 2022-08-31 18:08:40.719326350 +0200 @@ -1,0 +2,8 @@ +Mon Aug 29 10:35:12 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 3.3.2 + * Enhanced mysql_close() and other related parts to prevent + memory leaks when terminating an initiated but unestablished + connection + +------------------------------------------------------------------- Old: ---- mariadb-connector-c-3.3.1-src.tar.gz mariadb-connector-c-3.3.1-src.tar.gz.asc New: ---- mariadb-connector-c-3.3.2-src.tar.gz mariadb-connector-c-3.3.2-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb-connector-c.spec ++++++ --- /var/tmp/diff_new_pack.E5p5ek/_old 2022-08-31 18:08:41.443328266 +0200 +++ /var/tmp/diff_new_pack.E5p5ek/_new 2022-08-31 18:08:41.447328276 +0200 @@ -25,7 +25,7 @@ %endif %bcond_with sqlite3 Name: mariadb-connector-c -Version: 3.3.1 +Version: 3.3.2 Release: 0 Summary: MariaDB connector in C License: LGPL-2.1-or-later ++++++ mariadb-connector-c-3.3.1-src.tar.gz -> mariadb-connector-c-3.3.2-src.tar.gz ++++++ ++++ 5945 lines of diff (skipped)

1 0

commit libmad for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libmad for openSUSE:Factory checked in at 2022-08-31 18:08:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmad (Old) and /work/SRC/openSUSE:Factory/.libmad.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmad" Wed Aug 31 18:08:34 2022 rev:4 rq:1000150 version:0.15.1b Changes: -------- --- /work/SRC/openSUSE:Factory/libmad/libmad.changes 2018-02-22 14:58:47.629887473 +0100 +++ /work/SRC/openSUSE:Factory/.libmad.new.2083/libmad.changes 2022-08-31 18:08:39.535323218 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 12:39:50 UTC 2022 - Adam Majer <adam.majer(a)suse.de> + +- length-check.patch: repaces frame_length.diff. Fixes now also + bsc#1036968 (CVE-2017-8373) +- use %license for the license + +------------------------------------------------------------------- Old: ---- frame_length.diff New: ---- length-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmad.spec ++++++ --- /var/tmp/diff_new_pack.GB9x1Y/_old 2022-08-31 18:08:40.015324488 +0200 +++ /var/tmp/diff_new_pack.GB9x1Y/_new 2022-08-31 18:08:40.019324498 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmad # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,7 +12,7 @@ # 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/ # @@ -22,9 +22,9 @@ Version: 0.15.1b Release: 0 Summary: An MPEG audio decoder library -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Other -Url: http://www.underbit.com/products/mad/ +URL: http://www.underbit.com/products/mad/ Source: https://sourceforge.net/projects/mad/files/libmad/%{version}/libmad-%{versi… Source1000: baselibs.conf Patch0: libmad-0.15.1b-automake.patch @@ -33,7 +33,7 @@ Patch3: Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff Patch4: libmad.thumb.diff Patch5: libmad-0.15.1b-ppc.patch -Patch6: frame_length.diff +Patch6: length-check.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -111,12 +111,11 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) -%doc CHANGES COPYING COPYRIGHT CREDITS README TODO VERSION +%license COPYING +%doc CHANGES COPYRIGHT CREDITS README TODO VERSION %{_libdir}/libmad.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/mad.h %{_libdir}/libmad.so %{_libdir}/pkgconfig/mad.pc ++++++ length-check.patch ++++++ ++++ 818 lines (skipped)

1 0

commit python-FontTools for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-FontTools for openSUSE:Factory checked in at 2022-08-31 18:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-FontTools (Old) and /work/SRC/openSUSE:Factory/.python-FontTools.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-FontTools" Wed Aug 31 18:08:33 2022 rev:15 rq:1000146 version:4.37.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-FontTools/python-FontTools.changes 2022-05-12 22:57:38.396577650 +0200 +++ /work/SRC/openSUSE:Factory/.python-FontTools.new.2083/python-FontTools.changes 2022-08-31 18:08:37.795318614 +0200 @@ -1,0 +2,27 @@ +Mon Aug 29 16:55:08 UTC 2022 - Gordon Leung <pirateclip(a)protonmail.com> + +- Update to 4.37.1 + * [subset] Fixed regression introduced with v4.37.0 while subsetting + the VarStore of HVAR and VVAR tables, whereby an + AttributeError: subset_varidxes was thrown because an apparently + unused import statement (with the side-effect of dynamically binding + that subset_varidxes method to the VarStore class) had been + accidentally deleted in an unrelated PR + * [pens] Added cairoPen + * [gvar] Read gvar more lazily by not parsing all of the glyf table + * [ttGlyphSet] Make drawPoints(pointPen) method work for CFF fonts + as well via adapter pen + * [cff.specializer] Fixed issue in charstring generalizer with the + blend operator + * [varLib.models] Added support for extrapolation + * [ttGlyphSet] Ensure the newly added _TTVarGlyphSet inherits from + _TTGlyphSet to keep backward compatibility with existing API + * [kern] Allow compiling legacy kern tables with more than 64k entries + * [visitor] Added new visitor API to traverse tree of objects and + dispatch based on the attribute type: cf. fontTools.misc.visitor + and fontTools.ttLib.ttVisitor. Added fontTools.ttLib.scaleUpem + module that uses the latter to change a font's units-per-em and + scale all the related fields accordingly + * Etc. https://github.com/fonttools/fonttools/compare/4.33.3...4.37.1 + +------------------------------------------------------------------- Old: ---- fonttools-4.33.3-gh.tar.gz New: ---- fonttools-4.37.1-gh.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-FontTools.spec ++++++ --- /var/tmp/diff_new_pack.nFG5t9/_old 2022-08-31 18:08:38.451320350 +0200 +++ /var/tmp/diff_new_pack.nFG5t9/_new 2022-08-31 18:08:38.459320371 +0200 @@ -27,7 +27,7 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-FontTools%{psuffix} -Version: 4.33.3 +Version: 4.37.1 Release: 0 Summary: Suite of Tools and Libraries for Manipulating Fonts License: MIT AND OFL-1.1 ++++++ fonttools-4.33.3-gh.tar.gz -> fonttools-4.37.1-gh.tar.gz ++++++ ++++ 17518 lines of diff (skipped)

1 0

commit ibus for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2022-08-31 18:08:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus" Wed Aug 31 18:08:32 2022 rev:118 rq:1000145 version:1.5.27 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2022-08-28 13:12:13.832530622 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new.2083/ibus.changes 2022-08-31 18:08:36.831316064 +0200 @@ -1,0 +2,8 @@ +Mon Aug 29 15:18:08 UTC 2022 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Do not run ibus-autostart with xdg-autostart-generator (KDE etc.) + * A workaround for boo#1202841 + * Please use org.freedesktop.IBus.session.generic.service instead + (See boo#1201421) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-autostart.desktop ++++++ --- /var/tmp/diff_new_pack.hotadm/_old 2022-08-31 18:08:37.523317895 +0200 +++ /var/tmp/diff_new_pack.hotadm/_new 2022-08-31 18:08:37.527317905 +0200 @@ -10,4 +10,5 @@ NoDisplay=true X-KDE-autostart-after=panel X-KDE-StartupNotify=false +X-systemd-skip=true

1 0

commit python-jaraco.packaging for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.packaging for openSUSE:Factory checked in at 2022-08-31 18:08:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.packaging (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.packaging.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.packaging" Wed Aug 31 18:08:31 2022 rev:6 rq:1000125 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.packaging/python-jaraco.packaging.changes 2021-11-21 23:51:47.838327367 +0100 +++ /work/SRC/openSUSE:Factory/.python-jaraco.packaging.new.2083/python-jaraco.packaging.changes 2022-08-31 18:08:36.075314064 +0200 @@ -1,0 +2,18 @@ +Mon Aug 29 19:50:09 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Remove stray python3.inv + +------------------------------------------------------------------- +Mon Aug 29 10:11:16 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to v9.0.0 + * Use pep517.meta to load package metadata. Adds support + for packages without setup.py. + * Removed info module (and setuptools show command). + * Removed depends module. Use other packaging tools instead. +- v8.2.1: Rely on PEP 420 for namespace package. +- v8.2.0: Inject rst_epilog to include ``|project|`` substitution. +- Remove jaraco.base: PEP420 namespace packages do not use that + kind of scheme anymore. + +------------------------------------------------------------------- Old: ---- jaraco.packaging-8.1.0.tar.gz python-jaraco.base.changes python-jaraco.base.spec New: ---- jaraco.packaging-9.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.packaging.spec ++++++ --- /var/tmp/diff_new_pack.FF7XBG/_old 2022-08-31 18:08:36.551315323 +0200 +++ /var/tmp/diff_new_pack.FF7XBG/_new 2022-08-31 18:08:36.555315334 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.packaging # -# 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,27 +16,31 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Release: 0 Summary: Supplement packaging Python releases License: MIT URL: https://github.com/jaraco/jaraco.packaging Source: https://files.pythonhosted.org/packages/source/j/jaraco.packaging/jaraco.pa… -BuildRequires: %{python_module jaraco.base >= 6.1} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} -BuildRequires: %{python_module toml} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module importlib-metadata if %python-version < 3.8} +BuildRequires: %{python_module pep517} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools >= 56} +BuildRequires: %{python_module setuptools_scm >= 3.4.1} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-jaraco.base >= 6.1 -Requires: python-six -Requires(post): update-alternatives -Requires(preun):update-alternatives +# SECTION test and docs +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module rst.linker >= 1.9} +# /SECTION +Requires: python-pep517 +%if 0%{?python_version_nodots} < 38 +Requires: python-importlib-metadata +%endif BuildArch: noarch %python_subpackages @@ -45,38 +49,23 @@ %prep %setup -q -n jaraco.packaging-%{version} -sed -i 's/--flake8//' pytest.ini -sed -i 's/--black --cov//' pytest.ini rm -rf jaraco.packaging.egg-info %build -%python_build +%pyproject_wheel %install -%python_install -# We will package the namespace __init__.py separately -%{python_expand rm %{buildroot}%{$python_sitelib}/jaraco/__init__.py* -rm -rf %{buildroot}%{$python_sitelib}/jaraco/__pycache__/ -%fdupes %{buildroot}%{$python_sitelib} -} - -%python_clone -a %{buildroot}%{_bindir}/dependency-tree - -%post -%python_install_alternative dependency-tree upload-package - -%postun -%python_uninstall_alternative dependency-tree - -%check -# the test depends on accessing PyPI -%pytest -k 'not test_revived_distribution' +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +#%%check +# Upstream removed their test suite from the repository, only checking for correct typing and lint %files %{python_files} %license LICENSE %doc docs/*.rst CHANGES.rst README.rst -%python_alternative %{_bindir}/dependency-tree -%{python_sitelib}/jaraco.packaging-%{version}-py*.egg-info +%{python_sitelib}/jaraco.packaging-%{version}*-info +%dir %{python_sitelib}/jaraco %{python_sitelib}/jaraco/packaging/ %changelog ++++++ jaraco.packaging-8.1.0.tar.gz -> jaraco.packaging-9.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.coveragerc new/jaraco.packaging-9.0.0/.coveragerc --- old/jaraco.packaging-8.1.0/.coveragerc 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.coveragerc 2022-02-11 03:55:53.000000000 +0100 @@ -1,5 +1,7 @@ [run] -omit = .tox/* +omit = + # leading `*/` for pytest-dev/pytest-cov#456 + */.tox/* [report] show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.editorconfig new/jaraco.packaging-9.0.0/.editorconfig --- old/jaraco.packaging-8.1.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.editorconfig 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +indent_style = tab +indent_size = 4 +insert_final_newline = true +end_of_line = lf + +[*.py] +indent_style = space +max_line_length = 88 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.flake8 new/jaraco.packaging-9.0.0/.flake8 --- old/jaraco.packaging-8.1.0/.flake8 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.flake8 2022-02-11 03:55:53.000000000 +0100 @@ -1,9 +1,9 @@ [flake8] max-line-length = 88 -ignore = - # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513 - W503 - # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545 - W504 + +# jaraco/skeleton#34 +max-complexity = 10 + +extend-ignore = # Black creates whitespace before colon E203 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.github/dependabot.yml new/jaraco.packaging-9.0.0/.github/dependabot.yml --- old/jaraco.packaging-8.1.0/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.github/dependabot.yml 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "all" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.github/workflows/main.yml new/jaraco.packaging-9.0.0/.github/workflows/main.yml --- old/jaraco.packaging-8.1.0/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.github/workflows/main.yml 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,48 @@ +name: tests + +on: [push, pull_request] + +jobs: + test: + strategy: + matrix: + python: + - 3.7 + - 3.9 + - "3.10" + platform: + - ubuntu-latest + - macos-latest + - windows-latest + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + - name: Install tox + run: | + python -m pip install tox + - name: Run tests + run: tox + + release: + needs: test + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: Install tox + run: | + python -m pip install tox + - name: Release + run: tox -e release + env: + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.pre-commit-config.yaml new/jaraco.packaging-9.0.0/.pre-commit-config.yaml --- old/jaraco.packaging-8.1.0/.pre-commit-config.yaml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.pre-commit-config.yaml 2022-02-11 03:55:53.000000000 +0100 @@ -1,10 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black - -- repo: https://github.com/asottile/blacken-docs - rev: v1.4.0 - hooks: - - id: blacken-docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.readthedocs.yml new/jaraco.packaging-9.0.0/.readthedocs.yml --- old/jaraco.packaging-8.1.0/.readthedocs.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.readthedocs.yml 2022-02-11 03:55:53.000000000 +0100 @@ -1,5 +1,6 @@ +version: 2 python: - version: 3 - extra_requirements: - - docs - pip_install: true + install: + - path: . + extra_requirements: + - docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.travis.yml new/jaraco.packaging-9.0.0/.travis.yml --- old/jaraco.packaging-8.1.0/.travis.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -dist: xenial -language: python - -python: -- 3.6 -- &latest_py3 3.8 - -cache: pip - -install: -- 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.packaging-8.1.0/CHANGES.rst new/jaraco.packaging-9.0.0/CHANGES.rst --- old/jaraco.packaging-8.1.0/CHANGES.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/CHANGES.rst 2022-02-11 03:55:53.000000000 +0100 @@ -1,3 +1,28 @@ +v9.0.0 +====== + +Use pep517.meta to load package metadata. Adds support +for packages without setup.py. + +Removed info module (and setuptools show command). + +Removed depends module. Use other packaging tools instead. + +v8.2.1 +====== + +Rely on PEP 420 for namespace package. + +v8.2.0 +====== + +Inject rst_epilog to include ``|project|`` substitution. + +v8.1.1 +====== + +Refresh package metadata. + v8.1.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/PKG-INFO new/jaraco.packaging-9.0.0/PKG-INFO --- old/jaraco.packaging-8.1.0/PKG-INFO 2020-02-16 16:58:31.906517500 +0100 +++ new/jaraco.packaging-9.0.0/PKG-INFO 2022-02-11 03:56:17.035524400 +0100 @@ -1,96 +1,11 @@ Metadata-Version: 2.1 Name: jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Summary: tools to supplement packaging Python releases Home-page: https://github.com/jaraco/jaraco.packaging Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.packaging - - .. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jar… - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&… - - .. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco-packaging/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest - :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest - - Tools for packaging. - - dependency_tree - =============== - - A distutils command for reporting the dependency tree as resolved - by setuptools. Use after installing a package. - - show - ==== - - A distutils command for reporting the attributes of a distribution, - such as the version or author name. Here are some examples against - this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco(a)jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - - Note that passing -q suppresses the "running show" message. - - Attributes may be specified as comma-separated or space-separated keys. - Results are printed using ``subprocess.list2cmdline`` so may be parsed using - ``shlex.split``. By default, 'name' and 'version' are printed. - - sphinx - ====== - - This package provides a Sphinx extension that will inject into the config - the following values from the project's package metadata (as presented by - distutils): - - - project (from name) - - author - - copyright (same as author) - - version - - release (same as version) - - package_url (from url) - - To enable, include 'jaraco.packaging' in your requirements and add - 'jaraco.packaging.sphinx' to your list of extensions in your config file:: - - extensions=['jaraco.packaging.sphinx'] - - make-tree - ========= - - A utility for taking output from ``pipdeptree --json`` and producing a tree - rooted at a given package. - - Usage:: - - pipdeptree --json | python -m jaraco.packaging.make-tree mypkg - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -98,6 +13,62 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Framework :: Sphinx :: Extension -Requires-Python: >=3.6 +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.packaging + +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22test… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest + :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Tools for packaging. + +sphinx +====== + +This package provides a Sphinx extension that will inject into the config +the following values from the project's package metadata (as presented by +distutils): + + - project (from name) + - author + - copyright (same as author) + - version + - release (same as version) + - package_url (from url) + +To enable, include 'jaraco.packaging' in your requirements and add +'jaraco.packaging.sphinx' to your list of extensions in your config file:: + + extensions=['jaraco.packaging.sphinx'] + +make-tree +========= + +A utility for taking output from ``pipdeptree --json`` and producing a tree +rooted at a given package. + +Usage:: + + pipdeptree --json | python -m jaraco.packaging.make-tree mypkg + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/README.rst new/jaraco.packaging-9.0.0/README.rst --- old/jaraco.packaging-8.1.0/README.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/README.rst 2022-02-11 03:55:53.000000000 +0100 @@ -6,53 +6,21 @@ .. _PyPI link: https://pypi.org/project/jaraco.packaging -.. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jar… - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&… - -.. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22test… + :alt: tests .. image:: https://img.shields.io/badge/code%20style-black-000000.svg :target: https://github.com/psf/black :alt: Code style: Black -.. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco-packaging/master.svg -.. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest -Tools for packaging. - -dependency_tree -=============== +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton -A distutils command for reporting the dependency tree as resolved -by setuptools. Use after installing a package. - -show -==== - -A distutils command for reporting the attributes of a distribution, -such as the version or author name. Here are some examples against -this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco(a)jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - -Note that passing -q suppresses the "running show" message. - -Attributes may be specified as comma-separated or space-separated keys. -Results are printed using ``subprocess.list2cmdline`` so may be parsed using -``shlex.split``. By default, 'name' and 'version' are printed. +Tools for packaging. sphinx ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/appveyor.yml new/jaraco.packaging-9.0.0/appveyor.yml --- old/jaraco.packaging-8.1.0/appveyor.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -environment: - - APPVEYOR: true - - matrix: - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python38-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 -U tox tox-venv virtualenv" - - "tox" - -version: '{build}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/azure-pipelines.yml new/jaraco.packaging-9.0.0/azure-pipelines.yml --- old/jaraco.packaging-8.1.0/azure-pipelines.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/azure-pipelines.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -# Create the project in Azure with: -# az devops project create --name $name --organization https://dev.azure.com/$org/ --visibility public -# then configure the pipelines (through web UI) - -trigger: - branches: - include: - - '*' - tags: - include: - - '*' - -pool: - vmimage: 'Ubuntu-18.04' - -variables: -- group: Azure secrets - -stages: -- stage: Test - jobs: - - - job: 'Test' - strategy: - matrix: - Python36: - python.version: '3.6' - Python38: - python.version: '3.8' - maxParallel: 4 - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(python.version)' - architecture: 'x64' - - - script: python -m pip install tox - displayName: 'Install tox' - - - script: | - tox -- --junit-xml=test-results.xml - displayName: 'run tests' - - - task: PublishTestResults@2 - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() - -- stage: Publish - dependsOn: Test - jobs: - - job: 'Publish' - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.8' - architecture: 'x64' - - - script: python -m pip install tox - displayName: 'Install tox' - - - script: | - tox -e release - env: - TWINE_PASSWORD: $(PyPI-token) - displayName: 'publish to PyPI' - - condition: contains(variables['Build.SourceBranch'], 'tags') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/docs/conf.py new/jaraco.packaging-9.0.0/docs/conf.py --- old/jaraco.packaging-8.1.0/docs/conf.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/docs/conf.py 2022-02-11 03:55:53.000000000 +0100 @@ -14,7 +14,7 @@ url='{package_url}/issues/{issue}', ), dict( - pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n', + pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)', with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n', ), dict( @@ -24,3 +24,13 @@ ], ) } + +# Be strict about any broken references: +nitpicky = True + +# Include Python intersphinx mapping to prevent failures +# jaraco/skeleton#51 +extensions += ['sphinx.ext.intersphinx'] +intersphinx_mapping = { + 'python': ('https://docs.python.org/3', None), +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/docs/index.rst new/jaraco.packaging-9.0.0/docs/index.rst --- old/jaraco.packaging-8.1.0/docs/index.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/docs/index.rst 2022-02-11 03:55:53.000000000 +0100 @@ -1,5 +1,5 @@ -Welcome to jaraco.packaging documentation! -========================================== +Welcome to |project| documentation! +=================================== .. toctree:: :maxdepth: 1 @@ -11,21 +11,6 @@ :members: :undoc-members: :show-inheritance: - -.. automodule:: jaraco.packaging.cheese - :members: - :undoc-members: - :show-inheritance: - -.. automodule:: jaraco.packaging.depends - :members: - :undoc-members: - :show-inheritance: - -.. automodule:: jaraco.packaging.info - :members: - :undoc-members: - :show-inheritance: .. automodule:: jaraco.packaging.sphinx :members: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/__init__.py new/jaraco.packaging-9.0.0/jaraco/__init__.py --- old/jaraco.packaging-8.1.0/jaraco/__init__.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/depends.py new/jaraco.packaging-9.0.0/jaraco/packaging/depends.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/depends.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/depends.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,119 +0,0 @@ -""" -This module should only import modules from stdlib and setuptools -""" - -from __future__ import print_function, unicode_literals - -import os -import re -import argparse -import subprocess - -import setuptools -import pkg_resources - -text_type = getattr(__builtins__, 'unicode', str) - -req_help = "A setuptools requirement spec (e.g. 'eggmonster' or " "'eggmonster==0.1')" -python_help = "Use a remote environment rather than the local one." - - -def tree_cmd(): - parser = argparse.ArgumentParser() - parser.add_argument('requirement', help=req_help) - parser.add_argument('--python', help=python_help) - args = parser.parse_args() - if args.python: - return check_dependencies_remote(args) - check_dependencies(args.requirement) - - -def print_package(requirement, indent): - r = requirement - print(' ' * indent + str(r), '[{0}]'.format(pkg_resources.get_distribution(r))) - - -def parse_extras(req): - pattern = re.compile(r'\[(.*)\]') - res = pattern.search(text_type(req)) - return res.group(1).split(',') if res else [] - - -def check_dependencies(req, indent=1, history=None): - """ - Given a setuptools package requirement (e.g. 'gryphon==2.42' or just - 'gryphon'), print a tree of dependencies as they resolve in this - environment. - """ - # keep a history to avoid infinite loops - if history is None: - history = set() - if req in history: - return - history.add(req) - d = pkg_resources.get_distribution(req) - extras = parse_extras(req) - if indent == 1: - print_package(req, 0) - for r in d.requires(extras=extras): - print_package(r, indent) - check_dependencies(r, indent + 1, history) - - -def load_dependencies(req, history=None): - """ - Load the dependency tree as a Python object tree, - suitable for JSON serialization. - - >>> deps = load_dependencies('jaraco.packaging') - >>> import json - >>> doc = json.dumps(deps) - """ - if history is None: - history = set() - dist = pkg_resources.get_distribution(req) - spec = dict(requirement=str(req), resolved=str(dist)) - if req not in history: - # traverse into children - history.add(req) - extras = parse_extras(req) - depends = [ - load_dependencies(dep, history=history) - for dep in dist.requires(extras=extras) - ] - if depends: - spec.update(depends=depends) - return spec - - -class DependencyTree(setuptools.Command): - description = "Report a tree of resolved dependencies" - user_options = [ - (str('requirement='), str('r'), req_help), - (str('python='), str('p'), python_help), - ] - - def finalize_options(self): - pass - - def initialize_options(self): - self.requirement = self.distribution.get_name() - self.python = None - - def run(self): - if self.python: - return check_dependencies_remote(self) - check_dependencies(self.requirement) - - -def check_dependencies_remote(args): - """ - Invoke this command on a remote Python. - """ - cmd = [args.python, '-m', 'depends', args.requirement] - env = dict(PYTHONPATH=os.path.dirname(__file__)) - return subprocess.check_call(cmd, env=env) - - -if __name__ == '__main__': - tree_cmd() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/info.py new/jaraco.packaging-9.0.0/jaraco/packaging/info.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/info.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/info.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -from __future__ import print_function - -import subprocess -import re - -import six - -import setuptools - - -class Show(setuptools.Command): - """ - >>> import sys, functools - >>> show_cmd = [sys.executable, "setup.py", "show"] - >>> run = functools.partial( - ... subprocess.check_output, universal_newlines=True) - >>> print(run(show_cmd + ['-a', 'name']), end='') - running show - jaraco.packaging - >>> print(run(show_cmd + ['-a', 'install_requires']), end='') - running show - "['six>=1.4', 'setuptools']" - """ - - description = "Report attributes of a distribution's metadata" - user_options = [ - (str('attributes='), str('a'), "space or comma-separated attributes") - ] - - def finalize_options(self): - if isinstance(self.attributes, six.string_types): - self.attributes = re.split('[, ]', self.attributes) - - def initialize_options(self): - self.attributes = 'name', 'version' - - def _lookup_attribute(self, attr_name): - return self._by_getter(attr_name) or self._by_attr(attr_name) - - def _by_attr(self, attr_name): - return getattr(self.distribution, attr_name) - - def _by_getter(self, attr_name): - method_name = 'get_' + attr_name - try: - method = getattr(self.distribution, method_name) - except AttributeError: - return - return method() - - def run(self): - values = map(self._lookup_attribute, self.attributes) - str_values = map(str, values) - print(subprocess.list2cmdline(str_values)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/sphinx.py new/jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/sphinx.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py 2022-02-11 03:55:53.000000000 +0100 @@ -1,22 +1,21 @@ -from __future__ import unicode_literals - import os -import sys import subprocess +import pep517.meta try: import importlib.metadata as imp_meta except ImportError: - import importlib_metadata as imp_meta + import importlib_metadata as imp_meta # type: ignore if 'check_output' not in dir(subprocess): - import subprocess32 as subprocess + import subprocess32 as subprocess # type: ignore def setup(app): app.add_config_value('package_url', '', '') app.connect('builder-inited', load_config_from_setup) + app.connect('builder-inited', configure_substitutions) app.connect('html-page-context', add_package_url) return dict(version=imp_meta.version('jaraco.packaging'), parallel_read_safe=True) @@ -27,19 +26,16 @@ """ # for now, assume project root is one level up root = os.path.join(app.confdir, '..') - setup_script = os.path.join(root, 'setup.py') - fields = ['--name', '--version', '--url', '--author'] - dist_info_cmd = [sys.executable, setup_script] + fields - output = subprocess.check_output(dist_info_cmd, cwd=root, universal_newlines=True) - outputs = output.strip().split('\n') - try: - project, version, url, author = outputs - except ValueError: - raise ValueError("Unexpected metadata output", output) - app.config.project = project - app.config.version = app.config.release = version - app.config.package_url = url - app.config.author = app.config.copyright = author + meta = pep517.meta.load(root).metadata + app.config.project = meta['Name'] + app.config.version = app.config.release = meta['Version'] + app.config.package_url = meta['Home-page'] + app.config.author = app.config.copyright = meta['Author'] + + +def configure_substitutions(app): + epilogs = app.config.rst_epilog, f'.. |project| replace:: {app.config.project}' + app.config.rst_epilog = '\n'.join(filter(None, epilogs)) def add_package_url(app, pagename, templatename, context, doctree): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/PKG-INFO new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/PKG-INFO --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/PKG-INFO 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/PKG-INFO 2022-02-11 03:56:17.000000000 +0100 @@ -1,96 +1,11 @@ Metadata-Version: 2.1 Name: jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Summary: tools to supplement packaging Python releases Home-page: https://github.com/jaraco/jaraco.packaging Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.packaging - - .. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jar… - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&… - - .. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco-packaging/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest - :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest - - Tools for packaging. - - dependency_tree - =============== - - A distutils command for reporting the dependency tree as resolved - by setuptools. Use after installing a package. - - show - ==== - - A distutils command for reporting the attributes of a distribution, - such as the version or author name. Here are some examples against - this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco(a)jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - - Note that passing -q suppresses the "running show" message. - - Attributes may be specified as comma-separated or space-separated keys. - Results are printed using ``subprocess.list2cmdline`` so may be parsed using - ``shlex.split``. By default, 'name' and 'version' are printed. - - sphinx - ====== - - This package provides a Sphinx extension that will inject into the config - the following values from the project's package metadata (as presented by - distutils): - - - project (from name) - - author - - copyright (same as author) - - version - - release (same as version) - - package_url (from url) - - To enable, include 'jaraco.packaging' in your requirements and add - 'jaraco.packaging.sphinx' to your list of extensions in your config file:: - - extensions=['jaraco.packaging.sphinx'] - - make-tree - ========= - - A utility for taking output from ``pipdeptree --json`` and producing a tree - rooted at a given package. - - Usage:: - - pipdeptree --json | python -m jaraco.packaging.make-tree mypkg - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -98,6 +13,62 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only Classifier: Framework :: Sphinx :: Extension -Requires-Python: >=3.6 +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.packaging + +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22test… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest + :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Tools for packaging. + +sphinx +====== + +This package provides a Sphinx extension that will inject into the config +the following values from the project's package metadata (as presented by +distutils): + + - project (from name) + - author + - copyright (same as author) + - version + - release (same as version) + - package_url (from url) + +To enable, include 'jaraco.packaging' in your requirements and add +'jaraco.packaging.sphinx' to your list of extensions in your config file:: + + extensions=['jaraco.packaging.sphinx'] + +make-tree +========= + +A utility for taking output from ``pipdeptree --json`` and producing a tree +rooted at a given package. + +Usage:: + + pipdeptree --json | python -m jaraco.packaging.make-tree mypkg + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/SOURCES.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/SOURCES.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/SOURCES.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/SOURCES.txt 2022-02-11 03:56:17.000000000 +0100 @@ -1,31 +1,26 @@ .coveragerc +.editorconfig .flake8 .pre-commit-config.yaml .readthedocs.yml -.travis.yml CHANGES.rst LICENSE README.rst -appveyor.yml -azure-pipelines.yml +mypy.ini pyproject.toml pytest.ini setup.cfg -setup.py -skeleton.md tox.ini +.github/dependabot.yml +.github/workflows/main.yml docs/conf.py docs/history.rst docs/index.rst -jaraco/__init__.py jaraco.packaging.egg-info/PKG-INFO jaraco.packaging.egg-info/SOURCES.txt jaraco.packaging.egg-info/dependency_links.txt -jaraco.packaging.egg-info/entry_points.txt jaraco.packaging.egg-info/requires.txt jaraco.packaging.egg-info/top_level.txt jaraco/packaging/__init__.py -jaraco/packaging/depends.py -jaraco/packaging/info.py jaraco/packaging/make-tree.py jaraco/packaging/sphinx.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/entry_points.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/entry_points.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/entry_points.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/entry_points.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[console_scripts] -dependency-tree = jaraco.packaging.depends:tree_cmd - -[distutils.commands] -dependency_tree = jaraco.packaging.depends:DependencyTree -show = jaraco.packaging.info:Show - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/requires.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/requires.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/requires.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/requires.txt 2022-02-11 03:56:17.000000000 +0100 @@ -1,17 +1,20 @@ -six>=1.4 -setuptools +pep517 [:python_version < "3.8"] importlib_metadata [docs] sphinx -jaraco.packaging>=3.2 +jaraco.packaging>=8.2 rst.linker>=1.9 [testing] -pytest!=3.7.3,>=3.5 -pytest-checkdocs>=1.2.3 +pytest>=6 +pytest-checkdocs>=2.4 pytest-flake8 -pytest-black-multipy pytest-cov +pytest-enabler>=1.0.1 + +[testing:platform_python_implementation != "PyPy"] +pytest-black>=0.3.7 +pytest-mypy>=0.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/mypy.ini new/jaraco.packaging-9.0.0/mypy.ini --- old/jaraco.packaging-8.1.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/mypy.ini 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,2 @@ +[mypy] +ignore_missing_imports = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/pyproject.toml new/jaraco.packaging-9.0.0/pyproject.toml --- old/jaraco.packaging-8.1.0/pyproject.toml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/pyproject.toml 2022-02-11 03:55:53.000000000 +0100 @@ -1,8 +1,20 @@ [build-system] -requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"] +requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"] build-backend = "setuptools.build_meta" [tool.black] skip-string-normalization = true [tool.setuptools_scm] + +[pytest.enabler.black] +addopts = "--black" + +[pytest.enabler.mypy] +addopts = "--mypy" + +[pytest.enabler.flake8] +addopts = "--flake8" + +[pytest.enabler.cov] +addopts = "--cov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/pytest.ini new/jaraco.packaging-9.0.0/pytest.ini --- old/jaraco.packaging-8.1.0/pytest.ini 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/pytest.ini 2022-02-11 03:55:53.000000000 +0100 @@ -1,7 +1,15 @@ [pytest] norecursedirs=dist build .tox .eggs -addopts=--doctest-modules --flake8 --black --cov +addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS filterwarnings= - # workaround for https://github.com/pypa/setuptools/issues/479 - ignore:::setuptools.depends:2 + # Suppress deprecation warning in flake8 + ignore:SelectableGroups dict interface is deprecated::flake8 + + # shopkeep/pytest-black#55 + ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning + + # tholo/pytest-flake8#83 + ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/setup.cfg new/jaraco.packaging-9.0.0/setup.cfg --- old/jaraco.packaging-8.1.0/setup.cfg 2020-02-16 16:58:31.906517500 +0100 +++ new/jaraco.packaging-9.0.0/setup.cfg 2022-02-11 03:56:17.039524600 +0100 @@ -1,5 +1,4 @@ [metadata] -license_file = LICENSE name = jaraco.packaging author = Jason R. Coombs author_email = jaraco(a)jaraco.com @@ -14,37 +13,38 @@ Programming Language :: Python :: 3 :: Only Framework :: Sphinx :: Extension -[bdist_wheel] -python-tag = py36 - [options] -packages = find: +packages = find_namespace: include_package_data = true -python_requires = >=3.6 +python_requires = >=3.7 install_requires = - six >= 1.4 - setuptools importlib_metadata; python_version < "3.8" -setup_requires = setuptools_scm[toml] >= 3.4.1 + pep517 + +[options.packages.find] +exclude = + build* + dist* + docs* + tests* [options.extras_require] testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs >= 1.2.3 + pytest >= 6 + pytest-checkdocs >= 2.4 pytest-flake8 - pytest-black-multipy + pytest-black >= 0.3.7; \ + python_implementation != "PyPy" pytest-cov + pytest-mypy >= 0.9.1; \ + python_implementation != "PyPy" + pytest-enabler >= 1.0.1 docs = sphinx - jaraco.packaging >= 3.2 + jaraco.packaging >= 8.2 rst.linker >= 1.9 [options.entry_points] -console_scripts = - dependency-tree=jaraco.packaging.depends:tree_cmd -distutils.commands = - dependency_tree=jaraco.packaging.depends:DependencyTree - show=jaraco.packaging.info:Show [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/setup.py new/jaraco.packaging-9.0.0/setup.py --- old/jaraco.packaging-8.1.0/setup.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import setuptools - -if __name__ == "__main__": - setuptools.setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/skeleton.md new/jaraco.packaging-9.0.0/skeleton.md --- old/jaraco.packaging-8.1.0/skeleton.md 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/skeleton.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,161 +0,0 @@ -# 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. - -Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8c… would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton. - -# 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 Read the Docs and AppVeyor badges commented out -- A CHANGES.rst file intended for publishing release notes about the project -- Use of [Black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier) - -## 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 `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 on a .flake8 file to correct some default behaviors: - -- disable mutually incompatible rules W503 and W504 -- support for Black format - -## Continuous Integration - -The project is pre-configured to run tests through multiple CI providers. - -### Azure Pipelines - -[Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/) are the preferred provider as they provide free, fast, multi-platform services. See azure-pipelines.yml for more details. - -Features include: - -- test against multiple Python versions -- run on Ubuntu Bionic - -### Travis CI - -[Travis CI](https://travis-ci.org) is configured through .travis.yml. Any new project must be enabled either through their web site or with the `travis enable` command. - -Features include: -- test against Python 3 -- run on Ubuntu Xenial -- correct for broken IPv6 - -### AppVeyor - -A minimal template for running under AppVeyor (Windows) is provided. - -### Continuous Deployments - -In addition to running tests, an additional deploy stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with Azure as the `Azure secrets` variable group. This variable group needs to be created only once per organization. For example: - -``` -# create a resource group if none exists -az group create --name main --location eastus2 -# create the vault (try different names until something works) -az keyvault create --name secrets007 --resource-group main -# create the secret -az keyvault secret set --vault-name secrets007 --name PyPI-token --value $token -``` - -Then, in the web UI for the project's Pipelines Library, create the `Azure secrets` variable group referencing the key vault name. - -For more details, see [this blog entry](https://blog.jaraco.com/configuring-azure-pipelines-with-secets/). - -## 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 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. - -Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD: - -``` -TWINE_PASSWORD={token} tox -e release -``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/tox.ini new/jaraco.packaging-9.0.0/tox.ini --- old/jaraco.packaging-8.1.0/tox.ini 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/tox.ini 2022-02-11 03:55:53.000000000 +0100 @@ -3,15 +3,11 @@ minversion = 3.2 # https://github.com/jaraco/skeleton/issues/6 tox_pip_extensions_ext_venv_update = true -# Ensure that a late version of pip is used even on tox-venv. -requires = - tox-pip-version>=0.0.6 - tox-venv +toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] deps = -pip_version = pip commands = pytest {posargs} usedevelop = True @@ -23,19 +19,21 @@ testing changedir = docs commands = - python -m sphinx . {toxinidir}/build/html + python -m sphinx -W --keep-going . {toxinidir}/build/html [testenv:release] skip_install = True deps = - pep517>=0.5 - twine[keyring]>=1.13 - path + build + twine>=3 + jaraco.develop>=7.1 passenv = TWINE_PASSWORD + GITHUB_TOKEN setenv = TWINE_USERNAME = {env:TWINE_USERNAME:__token__} commands = - python -c "import path; path.Path('dist').rmtree_p()" - python -m pep517.build . + python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)" + python -m build python -m twine upload dist/* + python -m jaraco.develop.create-github-release

1 0

commit python-jaraco.envs for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.envs for openSUSE:Factory checked in at 2022-08-31 18:08:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.envs (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.envs.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.envs" Wed Aug 31 18:08:30 2022 rev:4 rq:1000117 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.envs/python-jaraco.envs.changes 2022-07-18 18:32:52.761667195 +0200 +++ /work/SRC/openSUSE:Factory/.python-jaraco.envs.new.2083/python-jaraco.envs.changes 2022-08-31 18:08:35.431312360 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 14:37:15 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Do not own the jaraco toplevel directory (PEP440 namespace pkg) +- Clean specfile from old distro code + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.envs.spec ++++++ --- /var/tmp/diff_new_pack.TGhdtW/_old 2022-08-31 18:08:35.891313577 +0200 +++ /var/tmp/diff_new_pack.TGhdtW/_new 2022-08-31 18:08:35.895313588 +0200 @@ -16,9 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -# requires python-path -%define skip_python2 1 Name: python-jaraco.envs Version: 2.4.0 Release: 0 @@ -31,7 +28,6 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 56} BuildRequires: %{python_module setuptools_scm >= 3.4.1} -BuildRequires: %{python_module tomli} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -68,6 +64,9 @@ %license LICENSE %doc docs/*.rst README.rst CHANGES.rst %{python_sitelib}/jaraco.envs-%{version}*info -%{python_sitelib}/jaraco +%dir %{python_sitelib}/jaraco +%{python_sitelib}/jaraco/envs.py* +%pycache_only %dir %{python_sitelib}/jaraco/__pycache__ +%pycache_only %{python_sitelib}/jaraco/__pycache__/envs*.py* %changelog

1 0

commit python-jaraco.collections for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.collections for openSUSE:Factory checked in at 2022-08-31 18:08:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.collections (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.collections.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.collections" Wed Aug 31 18:08:29 2022 rev:6 rq:1000110 version:3.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.collections/python-jaraco.collections.changes 2020-12-12 20:31:11.297778417 +0100 +++ /work/SRC/openSUSE:Factory/.python-jaraco.collections.new.2083/python-jaraco.collections.changes 2022-08-31 18:08:32.487304572 +0200 @@ -1,0 +2,19 @@ +Mon Aug 29 11:37:21 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to v3.5.2 + * Packaging refresh. + * Enrolled with Tidelift. +- v3.5.1 + * Fixed DictStack.__len__ and addressed recursion error on PyPy + in __getitem__. +- v3.5.0 + * DictStack now supports the following Mapping behaviors: + - .items() + - casting to a dict + - __contains__ (i.e. "x in stack") + * Require Python 3.7 or later. +- v3.4.0: Add WeightedLookup. +- v3.3.0: Add FreezableDefaultDict. +- v3.2.0: Rely on PEP 420 for namespace package. + +------------------------------------------------------------------- Old: ---- jaraco.collections-3.0.0.tar.gz New: ---- jaraco.collections-3.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.collections.spec ++++++ --- /var/tmp/diff_new_pack.9TVVto/_old 2022-08-31 18:08:35.187311714 +0200 +++ /var/tmp/diff_new_pack.9TVVto/_new 2022-08-31 18:08:35.191311726 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.collections # -# Copyright (c) 2020 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 @@ -19,25 +19,24 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-jaraco.collections -Version: 3.0.0 +Version: 3.5.2 Release: 0 Summary: Tools to work with collections License: MIT Group: Development/Languages/Python URL: https://github.com/jaraco/jaraco.collections Source0: https://files.pythonhosted.org/packages/source/j/jaraco.collections/jaraco.… -BuildRequires: %{python_module jaraco.base >= 6.1} +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module jaraco.classes} -BuildRequires: %{python_module jaraco.functools} BuildRequires: %{python_module jaraco.text} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools >= 56} +BuildRequires: %{python_module setuptools_scm >= 3.4.1} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-jaraco.base >= 6.1 Requires: python-jaraco.classes -Requires: python-jaraco.functools Requires: python-jaraco.text BuildArch: noarch %python_subpackages @@ -48,32 +47,32 @@ %prep %setup -q -n jaraco.collections-%{version} -sed -i 's/--flake8 --black --cov//' pytest.ini %build -%python_build +%pyproject_wheel %install -%python_install - -%python_expand rm %{buildroot}%{$python_sitelib}/jaraco/__init__.py - -%{?python_compileall} -%{!?python_compileall: # if we haven no python_compileall we are for sure still without multiple python3 flavors. -%py3_compile %{buildroot}%{python3_sitelib}/jaraco/ -%py3_compile -O %{buildroot}%{python3_sitelib}/jaraco/ -} - +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# work around for gh#pytest-dev/pytest#3396 until gh#pytest-dev/pytest#10088 lands in a pytest release +touch jaraco/__init__.py +cp -r %{python3_sitelib}/jaraco/* jaraco/ +%{python_expand # workaround for gh#jaraco/jaraco.text#10 without pathlib2 +if [ %{$python_version_nodots} -lt 310 ]; then + $python_donttest="or read_newlines or report_newlines" +fi +} +%pytest --doctest-modules -k "not (dummyprefix ${$python_donttest})" %files %{python_files} %license LICENSE %doc docs/*.rst README.rst CHANGES.rst -%{python_sitelib}/jaraco.collections-%{version}-py*.egg-info +%{python_sitelib}/jaraco.collections-%{version}*-info +%dir %{python_sitelib}/jaraco %{python_sitelib}/jaraco/collections.py* +%pycache_only %dir %{python_sitelib}/jaraco/__pycache__ %pycache_only %{python_sitelib}/jaraco/__pycache__/collections*.py* %changelog ++++++ jaraco.collections-3.0.0.tar.gz -> jaraco.collections-3.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.coveragerc new/jaraco.collections-3.5.2/.coveragerc --- old/jaraco.collections-3.0.0/.coveragerc 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/.coveragerc 2022-07-14 07:05:52.000000000 +0200 @@ -1,5 +1,8 @@ [run] -omit = .tox/* +omit = + # leading `*/` for pytest-dev/pytest-cov#456 + */.tox/* + */pep517-build-env-* [report] show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.editorconfig new/jaraco.collections-3.5.2/.editorconfig --- old/jaraco.collections-3.0.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.collections-3.5.2/.editorconfig 2022-07-14 07:05:52.000000000 +0200 @@ -0,0 +1,19 @@ +root = true + +[*] +charset = utf-8 +indent_style = tab +indent_size = 4 +insert_final_newline = true +end_of_line = lf + +[*.py] +indent_style = space +max_line_length = 88 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 + +[*.rst] +indent_style = space diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.flake8 new/jaraco.collections-3.5.2/.flake8 --- old/jaraco.collections-3.0.0/.flake8 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/.flake8 2022-07-14 07:05:52.000000000 +0200 @@ -1,9 +1,9 @@ [flake8] max-line-length = 88 -ignore = - # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513 - W503 - # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545 - W504 + +# jaraco/skeleton#34 +max-complexity = 10 + +extend-ignore = # Black creates whitespace before colon E203 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.github/FUNDING.yml new/jaraco.collections-3.5.2/.github/FUNDING.yml --- old/jaraco.collections-3.0.0/.github/FUNDING.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.collections-3.5.2/.github/FUNDING.yml 2022-07-14 07:05:53.000000000 +0200 @@ -0,0 +1 @@ +tidelift: pypi/jaraco.collections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.github/dependabot.yml new/jaraco.collections-3.5.2/.github/dependabot.yml --- old/jaraco.collections-3.0.0/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.collections-3.5.2/.github/dependabot.yml 2022-07-14 07:05:53.000000000 +0200 @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "all" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.github/workflows/main.yml new/jaraco.collections-3.5.2/.github/workflows/main.yml --- old/jaraco.collections-3.0.0/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.collections-3.5.2/.github/workflows/main.yml 2022-07-14 07:05:53.000000000 +0200 @@ -0,0 +1,65 @@ +name: tests + +on: [push, pull_request] + +jobs: + test: + strategy: + matrix: + python: + # Build on pre-releases until stable, then stable releases. + # actions/setup-python#213 + - ~3.7.0-0 + - ~3.10.0-0 + - ~3.11.0-0 + platform: + - ubuntu-latest + - macos-latest + - windows-latest + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python }} + - name: Install tox + run: | + python -m pip install tox + - name: Run tests + run: tox + + check: # This job does nothing and is only used for the branch protection + if: always() + + needs: + - test + + runs-on: ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} + + release: + needs: + - check + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Install tox + run: | + python -m pip install tox + - name: Release + run: tox -e release + env: + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.pre-commit-config.yaml new/jaraco.collections-3.5.2/.pre-commit-config.yaml --- old/jaraco.collections-3.0.0/.pre-commit-config.yaml 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/.pre-commit-config.yaml 2022-07-14 07:05:53.000000000 +0200 @@ -1,5 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 19.3b0 + rev: 22.6.0 hooks: - id: black diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.readthedocs.yml new/jaraco.collections-3.5.2/.readthedocs.yml --- old/jaraco.collections-3.0.0/.readthedocs.yml 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/.readthedocs.yml 2022-07-14 07:05:53.000000000 +0200 @@ -1,5 +1,6 @@ +version: 2 python: - version: 3 - extra_requirements: - - docs - pip_install: true + install: + - path: . + extra_requirements: + - docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/.travis.yml new/jaraco.collections-3.5.2/.travis.yml --- old/jaraco.collections-3.0.0/.travis.yml 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -dist: xenial -language: python - -python: -- 3.6 -- &latest_py3 3.8 - -jobs: - fast_finish: true - include: - - stage: deploy - if: tag IS present - python: *latest_py3 - before_script: skip - script: tox -e release - -cache: pip - -install: -- 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.collections-3.0.0/CHANGES.rst new/jaraco.collections-3.5.2/CHANGES.rst --- old/jaraco.collections-3.0.0/CHANGES.rst 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/CHANGES.rst 2022-07-14 07:05:53.000000000 +0200 @@ -1,3 +1,47 @@ +v3.5.2 +====== + +Packaging refresh. + +Enrolled with Tidelift. + +v3.5.1 +====== + +Fixed ``DictStack.__len__`` and addressed recursion error on +PyPy in ``__getitem__``. + +v3.5.0 +====== + +``DictStack`` now supports the following Mapping behaviors: + + - ``.items()`` + - casting to a dict + - ``__contains__`` (i.e. "x in stack") + +Require Python 3.7 or later. + +v3.4.0 +====== + +Add ``WeightedLookup``. + +v3.3.0 +====== + +Add ``FreezableDefaultDict``. + +v3.2.0 +====== + +Rely on PEP 420 for namespace package. + +v3.1.0 +====== + +Refreshed packaging. Dropped dependency on six. + v3.0.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/LICENSE new/jaraco.collections-3.5.2/LICENSE --- old/jaraco.collections-3.0.0/LICENSE 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/LICENSE 2022-07-14 07:05:53.000000000 +0200 @@ -1,7 +1,19 @@ 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: +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 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. +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.collections-3.0.0/PKG-INFO new/jaraco.collections-3.5.2/PKG-INFO --- old/jaraco.collections-3.0.0/PKG-INFO 2019-12-20 05:55:20.170997900 +0100 +++ new/jaraco.collections-3.5.2/PKG-INFO 2022-07-14 07:06:17.886474400 +0200 @@ -1,41 +1,79 @@ Metadata-Version: 2.1 Name: jaraco.collections -Version: 3.0.0 +Version: 3.5.2 Summary: Collection objects similar to those in stdlib by jaraco Home-page: https://github.com/jaraco/jaraco.collections Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com -License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.collections.svg - :target: https://pypi.io/project/jaraco.collections - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg - - .. image:: https://img.shields.io/travis/jaraco/jaraco.collections/master.svg - :target: https://travis-ci.org/jaraco/jaraco.collections - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/skeleton/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/skeleton/branch/master - - .. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest - :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest - - Models and classes to supplement the stdlib 'collections' module. - - RangeMap - -------- - - A dictionary-like object that maps a range of values to a given value. - -Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 -Requires-Python: >=3.6 +Classifier: Programming Language :: Python :: 3 :: Only +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.collections.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.collections + +.. image:: https://github.com/jaraco/jaraco.collections/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.collections/actions?query=workflow%3A%22te… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest + :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +.. image:: https://tidelift.com/badges/package/pypi/jaraco.collections + :target: https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py… + +Models and classes to supplement the stdlib 'collections' module. + +See the docs, linked above, for descriptions and usage examples. + +Highlights include: + +- RangeMap: A mapping that accepts a range of values for keys. +- Projection: A subset over an existing mapping. +- DictFilter: A different implementation of a projection. +- KeyTransformingDict: Generalized mapping with keys transformed by a function. +- FoldedCaseKeyedDict: A dict whose string keys are case-insensitive. +- BijectiveMap: A map where keys map to values and values back to their keys. +- ItemsAsAttributes: A mapping mix-in exposing items as attributes. +- IdentityOverrideMap: A map whose keys map by default to themselves unless overridden. +- FrozenDict: A hashable, immutable map. +- Enumeration: An object whose keys are enumerated. +- Everything: A container that contains all things. +- Least, Greatest: Objects that are always less than or greater than any other. +- pop_all: Return all items from the mutable sequence and remove them from that sequence. +- DictStack: A stack of dicts, great for sharing scopes. +- WeightedLookup: A specialized RangeMap for selecting an item by weights. + +For Enterprise +============== + +Available as part of the Tidelift Subscription. + +This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. + +`Learn more <https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py…>`_. + +Security Contact +================ + +To report a security vulnerability, please use the +`Tidelift security contact <https://tidelift.com/security>`_. +Tidelift will coordinate the fix and disclosure. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/README.rst new/jaraco.collections-3.5.2/README.rst --- old/jaraco.collections-3.0.0/README.rst 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/README.rst 2022-07-14 07:05:53.000000000 +0200 @@ -1,24 +1,62 @@ .. image:: https://img.shields.io/pypi/v/jaraco.collections.svg - :target: https://pypi.io/project/jaraco.collections + :target: `PyPI link`_ .. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg + :target: `PyPI link`_ -.. image:: https://img.shields.io/travis/jaraco/jaraco.collections/master.svg - :target: https://travis-ci.org/jaraco/jaraco.collections +.. _PyPI link: https://pypi.org/project/jaraco.collections + +.. image:: https://github.com/jaraco/jaraco.collections/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.collections/actions?query=workflow%3A%22te… + :alt: tests .. image:: https://img.shields.io/badge/code%20style-black-000000.svg :target: https://github.com/psf/black :alt: Code style: Black -.. .. image:: https://img.shields.io/appveyor/ci/jaraco/skeleton/master.svg -.. :target: https://ci.appveyor.com/project/jaraco/skeleton/branch/master - .. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +.. image:: https://tidelift.com/badges/package/pypi/jaraco.collections + :target: https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py… + Models and classes to supplement the stdlib 'collections' module. -RangeMap --------- +See the docs, linked above, for descriptions and usage examples. + +Highlights include: -A dictionary-like object that maps a range of values to a given value. +- RangeMap: A mapping that accepts a range of values for keys. +- Projection: A subset over an existing mapping. +- DictFilter: A different implementation of a projection. +- KeyTransformingDict: Generalized mapping with keys transformed by a function. +- FoldedCaseKeyedDict: A dict whose string keys are case-insensitive. +- BijectiveMap: A map where keys map to values and values back to their keys. +- ItemsAsAttributes: A mapping mix-in exposing items as attributes. +- IdentityOverrideMap: A map whose keys map by default to themselves unless overridden. +- FrozenDict: A hashable, immutable map. +- Enumeration: An object whose keys are enumerated. +- Everything: A container that contains all things. +- Least, Greatest: Objects that are always less than or greater than any other. +- pop_all: Return all items from the mutable sequence and remove them from that sequence. +- DictStack: A stack of dicts, great for sharing scopes. +- WeightedLookup: A specialized RangeMap for selecting an item by weights. + +For Enterprise +============== + +Available as part of the Tidelift Subscription. + +This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. + +`Learn more <https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py…>`_. + +Security Contact +================ + +To report a security vulnerability, please use the +`Tidelift security contact <https://tidelift.com/security>`_. +Tidelift will coordinate the fix and disclosure. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/appveyor.yml new/jaraco.collections-3.5.2/appveyor.yml --- old/jaraco.collections-3.0.0/appveyor.yml 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -environment: - - APPVEYOR: true - - matrix: - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python38-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 -U tox tox-venv virtualenv" - - "tox" - -version: '{build}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/docs/conf.py new/jaraco.collections-3.5.2/docs/conf.py --- old/jaraco.collections-3.0.0/docs/conf.py 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/docs/conf.py 2022-07-14 07:05:53.000000000 +0200 @@ -14,13 +14,25 @@ url='{package_url}/issues/{issue}', ), dict( - pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n', + 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}/', + url='https://peps.python.org/pep-{pep_number:0>4}/', ), ], ) } + +# Be strict about any broken references: +nitpicky = True + +# Include Python intersphinx mapping to prevent failures +# jaraco/skeleton#51 +extensions += ['sphinx.ext.intersphinx'] +intersphinx_mapping = { + 'python': ('https://docs.python.org/3', None), +} + +extensions += ['jaraco.tidelift'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/docs/index.rst new/jaraco.collections-3.5.2/docs/index.rst --- old/jaraco.collections-3.0.0/docs/index.rst 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/docs/index.rst 2022-07-14 07:05:53.000000000 +0200 @@ -1,5 +1,5 @@ -Welcome to jaraco.collections documentation! -============================================ +Welcome to |project| documentation! +=================================== .. toctree:: :maxdepth: 1 @@ -7,6 +7,8 @@ history +.. tidelift-referral-banner:: + .. automodule:: jaraco.collections :members: :undoc-members: @@ -19,4 +21,3 @@ * :ref:`genindex` * :ref:`modindex` * :ref:`search` - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/jaraco/__init__.py new/jaraco.collections-3.5.2/jaraco/__init__.py --- old/jaraco.collections-3.0.0/jaraco/__init__.py 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/jaraco/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/jaraco/collections.py new/jaraco.collections-3.5.2/jaraco/collections.py --- old/jaraco.collections-3.0.0/jaraco/collections.py 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/jaraco/collections.py 2022-07-14 07:05:53.000000000 +0200 @@ -4,6 +4,7 @@ import itertools import copy import functools +import random from jaraco.classes.properties import NonDataProperty import jaraco.text @@ -515,7 +516,7 @@ return result # raise the original exception, but use the original class # name, not 'super'. - message, = e.args + (message,) = e.args message = message.replace('super', self.__class__.__name__, 1) e.args = (message,) raise @@ -572,12 +573,16 @@ 2 >>> stack['c'] 2 + >>> len(stack) + 3 >>> stack.push(dict(a=3)) >>> stack['a'] 3 >>> set(stack.keys()) == set(['a', 'b', 'c']) True - >>> dict(**stack) == dict(a=3, c=2, b=2) + >>> set(stack.items()) == set([('a', 3), ('b', 2), ('c', 2)]) + True + >>> dict(**stack) == dict(stack) == dict(a=3, c=2, b=2) True >>> d = stack.pop() >>> stack['a'] @@ -586,19 +591,28 @@ >>> stack['a'] 1 >>> stack.get('b', None) + >>> 'c' in stack + True """ - def keys(self): - return list(set(itertools.chain.from_iterable(c.keys() for c in self))) + def __iter__(self): + dicts = list.__iter__(self) + return iter(set(itertools.chain.from_iterable(c.keys() for c in dicts))) def __getitem__(self, key): - for scope in reversed(self): + for scope in reversed(tuple(list.__iter__(self))): if key in scope: return scope[key] raise KeyError(key) push = list.append + def __contains__(self, other): + return collections.abc.Mapping.__contains__(self, other) + + def __len__(self): + return len(list(iter(self))) + class BijectiveMap(dict): """ @@ -860,7 +874,7 @@ return True -class InstrumentedDict(collections.UserDict): +class InstrumentedDict(collections.UserDict): # type: ignore # buggy mypy """ Instrument an existing dictionary with additional functionality, but always reference and mutate @@ -961,3 +975,82 @@ """ result, items[:] = items[:], [] return result + + +# mypy disabled for pytest-dev/pytest#8332 +class FreezableDefaultDict(collections.defaultdict): # type: ignore + """ + Often it is desirable to prevent the mutation of + a default dict after its initial construction, such + as to prevent mutation during iteration. + + >>> dd = FreezableDefaultDict(list) + >>> dd[0].append('1') + >>> dd.freeze() + >>> dd[1] + [] + >>> len(dd) + 1 + """ + + def __missing__(self, key): + return getattr(self, '_frozen', super().__missing__)(key) + + def freeze(self): + self._frozen = lambda key: self.default_factory() + + +class Accumulator: + def __init__(self, initial=0): + self.val = initial + + def __call__(self, val): + self.val += val + return self.val + + +class WeightedLookup(RangeMap): + """ + Given parameters suitable for a dict representing keys + and a weighted proportion, return a RangeMap representing + spans of values proportial to the weights: + + >>> even = WeightedLookup(a=1, b=1) + + [0, 1) -> a + [1, 2) -> b + + >>> lk = WeightedLookup(a=1, b=2) + + [0, 1) -> a + [1, 3) -> b + + >>> lk[.5] + 'a' + >>> lk[1.5] + 'b' + + Adds ``.random()`` to select a random weighted value: + + >>> lk.random() in ['a', 'b'] + True + + >>> choices = [lk.random() for x in range(1000)] + + Statistically speaking, choices should be .5 a:b + >>> ratio = choices.count('a') / choices.count('b') + >>> .4 < ratio < .6 + True + """ + + def __init__(self, *args, **kwargs): + raw = dict(*args, **kwargs) + + # allocate keys by weight + indexes = map(Accumulator(), raw.values()) + super().__init__(zip(indexes, raw.keys()), key_match_comparator=operator.lt) + + def random(self): + lower, upper = self.bounds() + selector = random.random() * upper + return self[selector] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/jaraco.collections.egg-info/PKG-INFO new/jaraco.collections-3.5.2/jaraco.collections.egg-info/PKG-INFO --- old/jaraco.collections-3.0.0/jaraco.collections.egg-info/PKG-INFO 2019-12-20 05:55:19.000000000 +0100 +++ new/jaraco.collections-3.5.2/jaraco.collections.egg-info/PKG-INFO 2022-07-14 07:06:17.000000000 +0200 @@ -1,41 +1,79 @@ Metadata-Version: 2.1 Name: jaraco.collections -Version: 3.0.0 +Version: 3.5.2 Summary: Collection objects similar to those in stdlib by jaraco Home-page: https://github.com/jaraco/jaraco.collections Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com -License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.collections.svg - :target: https://pypi.io/project/jaraco.collections - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg - - .. image:: https://img.shields.io/travis/jaraco/jaraco.collections/master.svg - :target: https://travis-ci.org/jaraco/jaraco.collections - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/skeleton/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/skeleton/branch/master - - .. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest - :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest - - Models and classes to supplement the stdlib 'collections' module. - - RangeMap - -------- - - A dictionary-like object that maps a range of values to a given value. - -Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 -Requires-Python: >=3.6 +Classifier: Programming Language :: Python :: 3 :: Only +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.collections.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.collections + +.. image:: https://github.com/jaraco/jaraco.collections/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.collections/actions?query=workflow%3A%22te… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest + :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +.. image:: https://tidelift.com/badges/package/pypi/jaraco.collections + :target: https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py… + +Models and classes to supplement the stdlib 'collections' module. + +See the docs, linked above, for descriptions and usage examples. + +Highlights include: + +- RangeMap: A mapping that accepts a range of values for keys. +- Projection: A subset over an existing mapping. +- DictFilter: A different implementation of a projection. +- KeyTransformingDict: Generalized mapping with keys transformed by a function. +- FoldedCaseKeyedDict: A dict whose string keys are case-insensitive. +- BijectiveMap: A map where keys map to values and values back to their keys. +- ItemsAsAttributes: A mapping mix-in exposing items as attributes. +- IdentityOverrideMap: A map whose keys map by default to themselves unless overridden. +- FrozenDict: A hashable, immutable map. +- Enumeration: An object whose keys are enumerated. +- Everything: A container that contains all things. +- Least, Greatest: Objects that are always less than or greater than any other. +- pop_all: Return all items from the mutable sequence and remove them from that sequence. +- DictStack: A stack of dicts, great for sharing scopes. +- WeightedLookup: A specialized RangeMap for selecting an item by weights. + +For Enterprise +============== + +Available as part of the Tidelift Subscription. + +This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. + +`Learn more <https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=py…>`_. + +Security Contact +================ + +To report a security vulnerability, please use the +`Tidelift security contact <https://tidelift.com/security>`_. +Tidelift will coordinate the fix and disclosure. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/jaraco.collections.egg-info/SOURCES.txt new/jaraco.collections-3.5.2/jaraco.collections.egg-info/SOURCES.txt --- old/jaraco.collections-3.0.0/jaraco.collections.egg-info/SOURCES.txt 2019-12-20 05:55:20.000000000 +0100 +++ new/jaraco.collections-3.5.2/jaraco.collections.egg-info/SOURCES.txt 2022-07-14 07:06:17.000000000 +0200 @@ -1,22 +1,22 @@ .coveragerc +.editorconfig .flake8 .pre-commit-config.yaml .readthedocs.yml -.travis.yml CHANGES.rst LICENSE README.rst -appveyor.yml +mypy.ini pyproject.toml pytest.ini setup.cfg -setup.py -skeleton.md tox.ini +.github/FUNDING.yml +.github/dependabot.yml +.github/workflows/main.yml docs/conf.py docs/history.rst docs/index.rst -jaraco/__init__.py jaraco/collections.py jaraco.collections.egg-info/PKG-INFO jaraco.collections.egg-info/SOURCES.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/jaraco.collections.egg-info/requires.txt new/jaraco.collections-3.5.2/jaraco.collections.egg-info/requires.txt --- old/jaraco.collections-3.0.0/jaraco.collections.egg-info/requires.txt 2019-12-20 05:55:19.000000000 +0100 +++ new/jaraco.collections-3.5.2/jaraco.collections.egg-info/requires.txt 2022-07-14 07:06:17.000000000 +0200 @@ -1,15 +1,19 @@ jaraco.text jaraco.classes -six>=1.7.0 [docs] sphinx -jaraco.packaging>=3.2 +jaraco.packaging>=9 rst.linker>=1.9 +jaraco.tidelift>=1.4 [testing] -pytest!=3.7.3,>=3.5 -pytest-checkdocs>=1.2.3 +pytest>=6 +pytest-checkdocs>=2.4 pytest-flake8 -pytest-black-multipy pytest-cov +pytest-enabler>=1.3 + +[testing:platform_python_implementation != "PyPy"] +pytest-black>=0.3.7 +pytest-mypy>=0.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/mypy.ini new/jaraco.collections-3.5.2/mypy.ini --- old/jaraco.collections-3.0.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.collections-3.5.2/mypy.ini 2022-07-14 07:05:53.000000000 +0200 @@ -0,0 +1,2 @@ +[mypy] +ignore_missing_imports = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/pyproject.toml new/jaraco.collections-3.5.2/pyproject.toml --- old/jaraco.collections-3.0.0/pyproject.toml 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/pyproject.toml 2022-07-14 07:05:53.000000000 +0200 @@ -1,6 +1,20 @@ [build-system] -requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"] +requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"] build-backend = "setuptools.build_meta" [tool.black] skip-string-normalization = true + +[tool.setuptools_scm] + +[tool.pytest-enabler.black] +addopts = "--black" + +[tool.pytest-enabler.mypy] +addopts = "--mypy" + +[tool.pytest-enabler.flake8] +addopts = "--flake8" + +[tool.pytest-enabler.cov] +addopts = "--cov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/pytest.ini new/jaraco.collections-3.5.2/pytest.ini --- old/jaraco.collections-3.0.0/pytest.ini 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/pytest.ini 2022-07-14 07:05:53.000000000 +0200 @@ -1,5 +1,18 @@ [pytest] norecursedirs=dist build .tox .eggs -addopts=--doctest-modules --flake8 --black --cov +# doctests disabled due to pytest-dev/pytest#3396 +# addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS filterwarnings= + # Suppress deprecation warning in flake8 + ignore:SelectableGroups dict interface is deprecated::flake8 + + # shopkeep/pytest-black#55 + ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning + ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning + + # tholo/pytest-flake8#83 + ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning + ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/setup.cfg new/jaraco.collections-3.5.2/setup.cfg --- old/jaraco.collections-3.0.0/setup.cfg 2019-12-20 05:55:20.170997900 +0100 +++ new/jaraco.collections-3.5.2/setup.cfg 2022-07-14 07:06:17.886474400 +0200 @@ -1,8 +1,4 @@ -[bdist_wheel] -universal = 1 - [metadata] -license_file = LICENSE name = jaraco.collections author = Jason R. Coombs author_email = jaraco(a)jaraco.com @@ -14,28 +10,39 @@ Intended Audience :: Developers License :: OSI Approved :: MIT License Programming Language :: Python :: 3 + Programming Language :: Python :: 3 :: Only [options] -packages = find: +packages = find_namespace: include_package_data = true -python_requires = >=3.6 +python_requires = >=3.7 install_requires = jaraco.text jaraco.classes - six>=1.7.0 -setup_requires = setuptools_scm >= 1.15.0 + +[options.packages.find] +exclude = + build* + dist* + docs* + tests* [options.extras_require] testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs >= 1.2.3 + pytest >= 6 + pytest-checkdocs >= 2.4 pytest-flake8 - pytest-black-multipy + pytest-black >= 0.3.7; \ + python_implementation != "PyPy" pytest-cov + pytest-mypy >= 0.9.1; \ + python_implementation != "PyPy" + pytest-enabler >= 1.3 docs = sphinx - jaraco.packaging >= 3.2 + jaraco.packaging >= 9 rst.linker >= 1.9 + jaraco.tidelift >= 1.4 [options.entry_points] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/setup.py new/jaraco.collections-3.5.2/setup.py --- old/jaraco.collections-3.0.0/setup.py 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import setuptools - -if __name__ == "__main__": - setuptools.setup(use_scm_version=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/skeleton.md new/jaraco.collections-3.5.2/skeleton.md --- old/jaraco.collections-3.0.0/skeleton.md 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/skeleton.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -# 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. - -Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8c… would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton. - -# 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 -- Use of [black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier) - -## 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 `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: - -- disable mutually incompatible rules W503 and W504 -- support for black format - -## 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. - -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). - -### Continuous Deployments - -In addition to running tests, an additional deploy stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with Travis as the TWINE_PASSWORD environment variable. After the Travis project is created, configure the token through the web UI or with a command like the following (bash syntax): - -``` -TWINE_PASSWORD={token} travis env copy TWINE_PASSWORD -``` - -## 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 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. - -Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD: - -``` -TWINE_PASSWORD={token} tox -e release -``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/tests/test_collections.py new/jaraco.collections-3.5.2/tests/test_collections.py --- old/jaraco.collections-3.0.0/tests/test_collections.py 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/tests/test_collections.py 2022-07-14 07:05:53.000000000 +0200 @@ -1,5 +1,3 @@ -import six - from jaraco import collections @@ -11,7 +9,7 @@ @staticmethod def transform_key(key): - return six.text_type(key) + return str(key) def test_always_lower_keys_dict(): @@ -23,7 +21,7 @@ d['Lasting'] = 'fleeting' d[3] = 'three' d[{'a': 1}] = 'a is one' - assert all(isinstance(key, six.text_type) for key in d) + assert all(isinstance(key, str) for key in d) assert "{'a': 1}" in d assert 3 in d assert d[3] == d['3'] == 'three' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.collections-3.0.0/tox.ini new/jaraco.collections-3.5.2/tox.ini --- old/jaraco.collections-3.0.0/tox.ini 2019-12-20 05:54:59.000000000 +0100 +++ new/jaraco.collections-3.5.2/tox.ini 2022-07-14 07:05:53.000000000 +0200 @@ -3,16 +3,11 @@ minversion = 3.2 # https://github.com/jaraco/skeleton/issues/6 tox_pip_extensions_ext_venv_update = true -# Ensure that a late version of pip is used even on tox-venv. -requires = - tox-pip-version>=0.0.6 - tox-venv +toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] deps = - setuptools>=31.0.1 -pip_version = pip commands = pytest {posargs} usedevelop = True @@ -24,19 +19,21 @@ testing changedir = docs commands = - python -m sphinx . {toxinidir}/build/html + python -m sphinx -W --keep-going . {toxinidir}/build/html [testenv:release] skip_install = True deps = - pep517>=0.5 - twine[keyring]>=1.13 - path + build + twine>=3 + jaraco.develop>=7.1 passenv = TWINE_PASSWORD + GITHUB_TOKEN setenv = TWINE_USERNAME = {env:TWINE_USERNAME:__token__} commands = - python -c "import path; path.Path('dist').rmtree_p()" - python -m pep517.build . + python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)" + python -m build python -m twine upload dist/* + python -m jaraco.develop.create-github-release

1 0

commit python-jaraco.path for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.path for openSUSE:Factory checked in at 2022-08-31 18:08:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.path (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.path.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.path" Wed Aug 31 18:08:28 2022 rev:2 rq:1000109 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.path/python-jaraco.path.changes 2021-07-10 22:54:07.791931099 +0200 +++ /work/SRC/openSUSE:Factory/.python-jaraco.path.new.2083/python-jaraco.path.changes 2022-08-31 18:08:31.695302476 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 13:25:07 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 3.4.0 + * Require Python 3.7 or later. +- Switch to PEP517 and remove obsolete jaraco.base requirement + +------------------------------------------------------------------- Old: ---- jaraco.path-3.3.1.tar.gz New: ---- jaraco.path-3.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.path.spec ++++++ --- /var/tmp/diff_new_pack.ma8Gom/_old 2022-08-31 18:08:32.243303926 +0200 +++ /var/tmp/diff_new_pack.ma8Gom/_new 2022-08-31 18:08:32.251303947 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.path # -# 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,21 +16,21 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jaraco.path -Version: 3.3.1 +Version: 3.4.0 Release: 0 -Summary: miscellaneous path functions for jaraco packages +Summary: Miscellaneous path functions for jaraco packages License: MIT URL: https://github.com/jaraco/jaraco.path Source: https://files.pythonhosted.org/packages/source/j/jaraco.path/jaraco.path-%{… -BuildRequires: %{python_module jaraco.base} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools >= 56} BuildRequires: %{python_module setuptools_scm >= 3.4.1} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module singledispatch} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-singledispatch BuildArch: noarch %python_subpackages @@ -42,19 +42,23 @@ %setup -q -n jaraco.path-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check +# work around for gh#pytest-dev/pytest#3396 until gh#pytest-dev/pytest#10088 lands in a pytest release +touch jaraco/__init__.py %pytest %files %{python_files} %license LICENSE %dir %{python_sitelib}/jaraco/ %{python_sitelib}/jaraco/path.py -%{python_sitelib}/jaraco.path-%{version}-py%{python_version}.egg-info +%{python_sitelib}/jaraco.path-%{version}*-info +%pycache_only %dir %{python_sitelib}/jaraco/__pycache__ %pycache_only %{python_sitelib}/jaraco/__pycache__/path*.py* %changelog ++++++ jaraco.path-3.3.1.tar.gz -> jaraco.path-3.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.coveragerc new/jaraco.path-3.4.0/.coveragerc --- old/jaraco.path-3.3.1/.coveragerc 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/.coveragerc 2022-04-29 03:08:18.000000000 +0200 @@ -1,5 +1,7 @@ [run] -omit = .tox/* +omit = + # leading `*/` for pytest-dev/pytest-cov#456 + */.tox/* [report] show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.editorconfig new/jaraco.path-3.4.0/.editorconfig --- old/jaraco.path-3.3.1/.editorconfig 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/.editorconfig 2022-04-29 03:08:18.000000000 +0200 @@ -9,6 +9,7 @@ [*.py] indent_style = space +max_line_length = 88 [*.{yml,yaml}] indent_style = space diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.github/dependabot.yml new/jaraco.path-3.4.0/.github/dependabot.yml --- old/jaraco.path-3.3.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.path-3.4.0/.github/dependabot.yml 2022-04-29 03:08:18.000000000 +0200 @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "all" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.github/workflows/automerge.yml new/jaraco.path-3.4.0/.github/workflows/automerge.yml --- old/jaraco.path-3.3.1/.github/workflows/automerge.yml 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/.github/workflows/automerge.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -name: automerge -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - check_suite: - types: - - completed - status: {} -jobs: - automerge: - runs-on: ubuntu-latest - steps: - - name: automerge - uses: "pascalgn/automerge-action(a)v0.12.0" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.github/workflows/main.yml new/jaraco.path-3.4.0/.github/workflows/main.yml --- old/jaraco.path-3.3.1/.github/workflows/main.yml 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/.github/workflows/main.yml 2022-04-29 03:08:18.000000000 +0200 @@ -6,8 +6,14 @@ test: strategy: matrix: - python: [3.6, 3.8, 3.9] - platform: [ubuntu-latest, macos-latest, windows-latest] + python: + - 3.7 + - 3.9 + - "3.10" + platform: + - ubuntu-latest + - macos-latest + - windows-latest runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 @@ -21,8 +27,23 @@ - name: Run tests run: tox + check: # This job does nothing and is only used for the branch protection + if: always() + + needs: + - test + + runs-on: ubuntu-latest + + steps: + - name: Decide whether the needed jobs succeeded or failed + uses: re-actors/alls-green@release/v1 + with: + jobs: ${{ toJSON(needs) }} + release: - needs: test + needs: + - check if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') runs-on: ubuntu-latest @@ -31,7 +52,7 @@ - name: Setup Python uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: "3.10" - name: Install tox run: | python -m pip install tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/.pre-commit-config.yaml new/jaraco.path-3.4.0/.pre-commit-config.yaml --- old/jaraco.path-3.3.1/.pre-commit-config.yaml 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/.pre-commit-config.yaml 2022-04-29 03:08:18.000000000 +0200 @@ -1,10 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.1.0 hooks: - id: black - -- repo: https://github.com/asottile/blacken-docs - rev: v1.9.1 - hooks: - - id: blacken-docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/CHANGES.rst new/jaraco.path-3.4.0/CHANGES.rst --- old/jaraco.path-3.3.1/CHANGES.rst 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/CHANGES.rst 2022-04-29 03:08:18.000000000 +0200 @@ -1,3 +1,8 @@ +v3.4.0 +====== + +Require Python 3.7 or later. + v3.3.1 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/PKG-INFO new/jaraco.path-3.4.0/PKG-INFO --- old/jaraco.path-3.3.1/PKG-INFO 2021-02-25 23:38:43.851145000 +0100 +++ new/jaraco.path-3.4.0/PKG-INFO 2022-04-29 03:08:40.195732400 +0200 @@ -1,48 +1,71 @@ Metadata-Version: 2.1 Name: jaraco.path -Version: 3.3.1 +Version: 3.4.0 Summary: miscellaneous path functions Home-page: https://github.com/jaraco/jaraco.path Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.path.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.path.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.path - - .. image:: https://github.com/jaraco/jaraco.path/workflows/tests/badge.svg - :target: https://github.com/jaraco/jaraco.path/actions?query=workflow%3A%22tests%22 - :alt: tests - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest - .. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest - - - Hidden File Detection - --------------------- - - ``jaraco.path`` provides cross platform hidden file detection:: - - from jaraco import path - if path.is_hidden('/'): - print("Your root is hidden") - - hidden_dirs = filter(is_hidden, os.listdir('.')) - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.6 +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.path.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.path.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.path + +.. image:: https://github.com/jaraco/jaraco.path/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.path/actions?query=workflow%3A%22tests%22 + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest +.. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Hidden File Detection +--------------------- + +``jaraco.path`` provides cross platform hidden file detection:: + + from jaraco import path + if path.is_hidden('/'): + print("Your root is hidden") + + hidden_dirs = filter(is_hidden, os.listdir('.')) + + +Directory Builder +----------------- + +When testing (and perhaps in other cases), it's often necessary to construct +a tree of directories/files. This project provides a ``build`` function to +simply create such a directory from a dictionary definition:: + + from jaraco.path import build + build( + { + 'foo': 'Content of foo', + 'subdir': { + 'foo': 'Content of subdir/foo', + }, + }, + ) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/README.rst new/jaraco.path-3.4.0/README.rst --- old/jaraco.path-3.3.1/README.rst 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/README.rst 2022-04-29 03:08:18.000000000 +0200 @@ -17,6 +17,8 @@ .. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest .. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton Hidden File Detection --------------------- @@ -28,3 +30,21 @@ print("Your root is hidden") hidden_dirs = filter(is_hidden, os.listdir('.')) + + +Directory Builder +----------------- + +When testing (and perhaps in other cases), it's often necessary to construct +a tree of directories/files. This project provides a ``build`` function to +simply create such a directory from a dictionary definition:: + + from jaraco.path import build + build( + { + 'foo': 'Content of foo', + 'subdir': { + 'foo': 'Content of subdir/foo', + }, + }, + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/docs/conf.py new/jaraco.path-3.4.0/docs/conf.py --- old/jaraco.path-3.3.1/docs/conf.py 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/docs/conf.py 2022-04-29 03:08:18.000000000 +0200 @@ -24,3 +24,13 @@ ], ) } + +# Be strict about any broken references: +nitpicky = True + +# Include Python intersphinx mapping to prevent failures +# jaraco/skeleton#51 +extensions += ['sphinx.ext.intersphinx'] +intersphinx_mapping = { + 'python': ('https://docs.python.org/3', None), +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/jaraco/path.py new/jaraco.path-3.4.0/jaraco/path.py --- old/jaraco.path-3.3.1/jaraco/path.py 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/jaraco/path.py 2022-04-29 03:08:18.000000000 +0200 @@ -18,8 +18,6 @@ import pathlib from typing import Dict, Union -from singledispatch import singledispatch - log = logging.getLogger(__name__) @@ -307,10 +305,10 @@ create(contents, pathlib.Path(prefix) / name) -@singledispatch -def create(content: dict, path): +(a)functools.singledispatch +def create(content: Union[str, bytes, 'FilesSpec'], path): path.mkdir(exist_ok=True) - build(content, prefix=path) + build(content, prefix=path) # type: ignore @create.register @@ -318,6 +316,6 @@ path.write_bytes(content) -(a)create.register # type: ignore[no-redef] +(a)create.register def _(content: str, path): path.write_text(content) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/jaraco.path.egg-info/PKG-INFO new/jaraco.path-3.4.0/jaraco.path.egg-info/PKG-INFO --- old/jaraco.path-3.3.1/jaraco.path.egg-info/PKG-INFO 2021-02-25 23:38:43.000000000 +0100 +++ new/jaraco.path-3.4.0/jaraco.path.egg-info/PKG-INFO 2022-04-29 03:08:39.000000000 +0200 @@ -1,48 +1,71 @@ Metadata-Version: 2.1 Name: jaraco.path -Version: 3.3.1 +Version: 3.4.0 Summary: miscellaneous path functions Home-page: https://github.com/jaraco/jaraco.path Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.path.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.path.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.path - - .. image:: https://github.com/jaraco/jaraco.path/workflows/tests/badge.svg - :target: https://github.com/jaraco/jaraco.path/actions?query=workflow%3A%22tests%22 - :alt: tests - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest - .. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest - - - Hidden File Detection - --------------------- - - ``jaraco.path`` provides cross platform hidden file detection:: - - from jaraco import path - if path.is_hidden('/'): - print("Your root is hidden") - - hidden_dirs = filter(is_hidden, os.listdir('.')) - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.6 +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.path.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.path.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.path + +.. image:: https://github.com/jaraco/jaraco.path/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.path/actions?query=workflow%3A%22tests%22 + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest +.. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Hidden File Detection +--------------------- + +``jaraco.path`` provides cross platform hidden file detection:: + + from jaraco import path + if path.is_hidden('/'): + print("Your root is hidden") + + hidden_dirs = filter(is_hidden, os.listdir('.')) + + +Directory Builder +----------------- + +When testing (and perhaps in other cases), it's often necessary to construct +a tree of directories/files. This project provides a ``build`` function to +simply create such a directory from a dictionary definition:: + + from jaraco.path import build + build( + { + 'foo': 'Content of foo', + 'subdir': { + 'foo': 'Content of subdir/foo', + }, + }, + ) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/jaraco.path.egg-info/SOURCES.txt new/jaraco.path-3.4.0/jaraco.path.egg-info/SOURCES.txt --- old/jaraco.path-3.3.1/jaraco.path.egg-info/SOURCES.txt 2021-02-25 23:38:43.000000000 +0100 +++ new/jaraco.path-3.4.0/jaraco.path.egg-info/SOURCES.txt 2022-04-29 03:08:40.000000000 +0200 @@ -10,10 +10,8 @@ pyproject.toml pytest.ini setup.cfg -setup.py -skeleton.md tox.ini -.github/workflows/automerge.yml +.github/dependabot.yml .github/workflows/main.yml docs/conf.py docs/history.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/jaraco.path.egg-info/requires.txt new/jaraco.path-3.4.0/jaraco.path.egg-info/requires.txt --- old/jaraco.path-3.3.1/jaraco.path.egg-info/requires.txt 2021-02-25 23:38:43.000000000 +0100 +++ new/jaraco.path-3.4.0/jaraco.path.egg-info/requires.txt 2022-04-29 03:08:40.000000000 +0200 @@ -1,23 +1,22 @@ -singledispatch>=3.6 [:platform_system == "Darwin" and platform_python_implementation != "PyPy"] pyobjc [docs] sphinx -jaraco.packaging>=8.2 +jaraco.packaging>=9 rst.linker>=1.9 [testing] -pytest>=4.6 -pytest-checkdocs>=1.2.3 +pytest>=6 +pytest-checkdocs>=2.4 pytest-flake8 pytest-cov -pytest-enabler +pytest-enabler>=1.0.1 [testing:platform_python_implementation != "PyPy"] pytest-black>=0.3.7 -pytest-mypy +pytest-mypy>=0.9.1 [testing:platform_system == "Windows"] jaraco.windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/pyproject.toml new/jaraco.path-3.4.0/pyproject.toml --- old/jaraco.path-3.3.1/pyproject.toml 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/pyproject.toml 2022-04-29 03:08:18.000000000 +0200 @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"] +requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"] build-backend = "setuptools.build_meta" [tool.black] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/pytest.ini new/jaraco.path-3.4.0/pytest.ini --- old/jaraco.path-3.3.1/pytest.ini 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/pytest.ini 2022-04-29 03:08:18.000000000 +0200 @@ -2,6 +2,16 @@ norecursedirs=dist build .tox .eggs addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS -# workaround for warning pytest-dev/pytest#6178 -junit_family=xunit2 filterwarnings= + # Suppress deprecation warning in flake8 + ignore:SelectableGroups dict interface is deprecated::flake8 + + # shopkeep/pytest-black#55 + ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning + ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning + + # tholo/pytest-flake8#83 + ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning + ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/setup.cfg new/jaraco.path-3.4.0/setup.cfg --- old/jaraco.path-3.3.1/setup.cfg 2021-02-25 23:38:43.851145000 +0100 +++ new/jaraco.path-3.4.0/setup.cfg 2022-04-29 03:08:40.195732400 +0200 @@ -1,6 +1,4 @@ [metadata] -license_files = - LICENSE name = jaraco.path author = Jason R. Coombs author_email = jaraco(a)jaraco.com @@ -17,11 +15,9 @@ [options] packages = find_namespace: include_package_data = true -python_requires = >=3.6 +python_requires = >=3.7 install_requires = pyobjc; platform_system == "Darwin" and platform_python_implementation != "PyPy" - singledispatch >= 3.6 -setup_requires = setuptools_scm[toml] >= 3.4.1 [options.packages.find] exclude = @@ -32,18 +28,20 @@ [options.extras_require] testing = - pytest >= 4.6 - pytest-checkdocs >= 1.2.3 + pytest >= 6 + pytest-checkdocs >= 2.4 pytest-flake8 - pytest-black >= 0.3.7; python_implementation != "PyPy" + pytest-black >= 0.3.7; \ + python_implementation != "PyPy" pytest-cov - pytest-mypy; python_implementation != "PyPy" - pytest-enabler + pytest-mypy >= 0.9.1; \ + python_implementation != "PyPy" + pytest-enabler >= 1.0.1 jaraco.windows; platform_system == "Windows" docs = sphinx - jaraco.packaging >= 8.2 + jaraco.packaging >= 9 rst.linker >= 1.9 [options.entry_points] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/setup.py new/jaraco.path-3.4.0/setup.py --- old/jaraco.path-3.3.1/setup.py 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import setuptools - -if __name__ == "__main__": - setuptools.setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/skeleton.md new/jaraco.path-3.4.0/skeleton.md --- old/jaraco.path-3.3.1/skeleton.md 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/skeleton.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,166 +0,0 @@ -# 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. - -Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8c… would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton. - -# 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. - -For example, here's a session of the [path project](https://pypi.org/project/path) pulling non-conflicting changes from the skeleton: - -<img src="https://raw.githubusercontent.com/jaraco/skeleton/gh-pages/docs/refresh.svg"> - -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. - -## Periodic Collapse - -In late 2020, this project [introduced](https://github.com/jaraco/skeleton/issues/27) the idea of a periodic but infrequent (O(years)) collapse of commits to limit the number of commits a new consumer will need to accept to adopt the skeleton. - -The full history of commits is collapsed into a single commit and that commit becomes the new mainline head. - -When one of these collapse operations happens, any project that previously pulled from the skeleton will no longer have a related history with that new main branch. For those projects, the skeleton provides a "handoff" branch that reconciles the two branches. Any project that has previously merged with the skeleton but now gets an error "fatal: refusing to merge unrelated histories" should instead use the handoff branch once to incorporate the new main branch. - -``` -$ git pull https://github.com/jaraco/skeleton 2020-handoff -``` - -This handoff needs to be pulled just once and thereafter the project can pull from the main head. - -The archive and handoff branches from prior collapses are indicate here: - -| refresh | archive | handoff | -|---------|-----------------|--------------| -| 2020-12 | archive/2020-12 | 2020-handoff | - -# 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 Read the Docs and AppVeyor badges commented out -- A CHANGES.rst file intended for publishing release notes about the project -- Use of [Black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier) -- Integrated type checking through [mypy](https://github.com/python/mypy/). - -## 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 `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 on a .flake8 file to correct some default behaviors: - -- disable mutually incompatible rules W503 and W504 -- support for Black format - -## Continuous Integration - -The project is pre-configured to run Continuous Integration tests. - -### Github Actions - -[Github Actions](https://docs.github.com/en/free-pro-team@latest/actions) are the preferred provider as they provide free, fast, multi-platform services with straightforward configuration. Configured in `.github/workflows`. - -Features include: -- test against multiple Python versions -- run on late (and updated) platform versions -- automated releases of tagged commits -- [automatic merging of PRs](https://github.com/marketplace/actions/merge-pull-requests) (requires [protecting branches with required status checks](https://docs.github.com/en/free-pro-team@latest/github/administerin…, [not possible through API](https://github.community/t/set-all-status-checks-to-be-required-as-branch-protection-using-the-github-api/119493)) - - -### Continuous Deployments - -In addition to running tests, an additional publish stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with each Github project (or org) `PYPI_TOKEN` [secret](https://docs.github.com/en/free-pro-team@latest/actions/reference/e…. Example: - -``` -pip-run -q jaraco.develop -- -m jaraco.develop.add-github-secrets -``` - -## 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 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. - -Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD: - -``` -TWINE_PASSWORD={token} tox -e release -``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.path-3.3.1/tox.ini new/jaraco.path-3.4.0/tox.ini --- old/jaraco.path-3.3.1/tox.ini 2021-02-25 23:38:22.000000000 +0100 +++ new/jaraco.path-3.4.0/tox.ini 2022-04-29 03:08:18.000000000 +0200 @@ -19,14 +19,13 @@ testing changedir = docs commands = - python -m sphinx . {toxinidir}/build/html + python -m sphinx -W --keep-going . {toxinidir}/build/html [testenv:release] skip_install = True deps = build - twine[keyring]>=1.13 - path + twine>=3 jaraco.develop>=7.1 passenv = TWINE_PASSWORD @@ -34,7 +33,7 @@ setenv = TWINE_USERNAME = {env:TWINE_USERNAME:__token__} commands = - python -c "import path; path.Path('dist').rmtree_p()" + python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)" python -m build python -m twine upload dist/* python -m jaraco.develop.create-github-release

1 0

commit python-jaraco.itertools for openSUSE:Factory
by Source-Sync 31 Aug '22

31 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.itertools for openSUSE:Factory checked in at 2022-08-31 18:08:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.itertools (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.itertools.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.itertools" Wed Aug 31 18:08:28 2022 rev:6 rq:1000108 version:6.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.itertools/python-jaraco.itertools.changes 2021-11-10 21:46:04.079801512 +0100 +++ /work/SRC/openSUSE:Factory/.python-jaraco.itertools.new.2083/python-jaraco.itertools.changes 2022-08-31 18:08:30.991300614 +0200 @@ -1,0 +2,14 @@ +Mon Aug 29 11:56:23 UTC 2022 - Ben Greiner <code(a)bnavigator.de> + +- Update to 6.2.1: + #15: Fixed broken test in ensure_unique. +- v6.2.0: Added accumulate function. +- v6.1.1: Fixed typo in ensure_unique doctest. +- v6.1.0: Add ensure_unique function. +- v6.0.3: #13: Fixed doc build errors. +- v6.0.2: Minor fixes. +- v6.0.1: Switch to PEP 420 for namespace package. +- v6.0.0: Remove Counter.GetCount. Remove flatten and iflatten. +- Switch to PEP517 and remove obsolete jaraco.base requirement + +------------------------------------------------------------------- Old: ---- jaraco.itertools-5.0.0.tar.gz New: ---- jaraco.itertools-6.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.itertools.spec ++++++ --- /var/tmp/diff_new_pack.P3n6xi/_old 2022-08-31 18:08:31.507301979 +0200 +++ /var/tmp/diff_new_pack.P3n6xi/_new 2022-08-31 18:08:31.511301989 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.itertools # -# 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,27 +16,25 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-jaraco.itertools -Version: 5.0.0 +Version: 6.2.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.it… +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module inflect} -BuildRequires: %{python_module jaraco.base >= 6.1} BuildRequires: %{python_module more-itertools >= 4.0.0} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools_scm >= 1.15.0} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} +BuildRequires: %{python_module setuptools >= 56} +BuildRequires: %{python_module setuptools_scm >= 3.4.1} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-inflect -Requires: python-jaraco.base >= 6.1 Requires: python-more-itertools >= 4.0.0 BuildArch: noarch %python_subpackages @@ -47,30 +45,27 @@ %prep %setup -q -n jaraco.itertools-%{version} -sed -i 's/--flake8//' pytest.ini -sed -i 's/--black --cov//' pytest.ini +rm -r jaraco.itertools.egg-info %build -%python_build +%pyproject_wheel %install -%python_install - -%{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} -} +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# work around for gh#pytest-dev/pytest#3396 until gh#pytest-dev/pytest#10088 lands in a pytest release +touch jaraco/__init__.py +%pytest --doctest-modules %files %{python_files} %license LICENSE %doc docs/*.rst README.rst CHANGES.rst -%{python_sitelib}/jaraco.itertools-%{version}-py*.egg-info +%dir %{python_sitelib}/jaraco +%{python_sitelib}/jaraco.itertools-%{version}*-info %{python_sitelib}/jaraco/itertools.py* +%pycache_only %dir %{python_sitelib}/jaraco/__pycache__ %pycache_only %{python_sitelib}/jaraco/__pycache__/itertools*.py* %changelog ++++++ jaraco.itertools-5.0.0.tar.gz -> jaraco.itertools-6.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.coveragerc new/jaraco.itertools-6.2.1/.coveragerc --- old/jaraco.itertools-5.0.0/.coveragerc 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.coveragerc 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,7 @@ [run] -omit = .tox/* +omit = + # leading `*/` for pytest-dev/pytest-cov#456 + */.tox/* [report] show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.editorconfig new/jaraco.itertools-6.2.1/.editorconfig --- old/jaraco.itertools-5.0.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.editorconfig 2022-02-21 04:01:24.000000000 +0100 @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +indent_style = tab +indent_size = 4 +insert_final_newline = true +end_of_line = lf + +[*.py] +indent_style = space +max_line_length = 88 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.flake8 new/jaraco.itertools-6.2.1/.flake8 --- old/jaraco.itertools-5.0.0/.flake8 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.flake8 2022-02-21 04:01:24.000000000 +0100 @@ -1,9 +1,9 @@ [flake8] max-line-length = 88 -ignore = - # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513 - W503 - # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545 - W504 + +# jaraco/skeleton#34 +max-complexity = 10 + +extend-ignore = # Black creates whitespace before colon E203 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.github/dependabot.yml new/jaraco.itertools-6.2.1/.github/dependabot.yml --- old/jaraco.itertools-5.0.0/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.github/dependabot.yml 2022-02-21 04:01:24.000000000 +0100 @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + allow: + - dependency-type: "all" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.github/workflows/main.yml new/jaraco.itertools-6.2.1/.github/workflows/main.yml --- old/jaraco.itertools-5.0.0/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.github/workflows/main.yml 2022-02-21 04:01:24.000000000 +0100 @@ -0,0 +1,48 @@ +name: tests + +on: [push, pull_request] + +jobs: + test: + strategy: + matrix: + python: + - 3.7 + - 3.9 + - "3.10" + platform: + - ubuntu-latest + - macos-latest + - windows-latest + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + - name: Install tox + run: | + python -m pip install tox + - name: Run tests + run: tox + + release: + needs: test + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: Install tox + run: | + python -m pip install tox + - name: Release + run: tox -e release + env: + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.pre-commit-config.yaml new/jaraco.itertools-6.2.1/.pre-commit-config.yaml --- old/jaraco.itertools-5.0.0/.pre-commit-config.yaml 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.pre-commit-config.yaml 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 19.3b0 + rev: 22.1.0 hooks: - id: black diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.readthedocs.yml new/jaraco.itertools-6.2.1/.readthedocs.yml --- old/jaraco.itertools-5.0.0/.readthedocs.yml 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.readthedocs.yml 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,6 @@ +version: 2 python: - version: 3 - extra_requirements: - - docs - pip_install: true + install: + - path: . + extra_requirements: + - docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/.travis.yml new/jaraco.itertools-6.2.1/.travis.yml --- old/jaraco.itertools-5.0.0/.travis.yml 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -dist: xenial -language: python - -python: -- 3.6 -- &latest_py3 3.8 - -jobs: - fast_finish: true - include: - - stage: deploy - if: tag IS present - python: *latest_py3 - before_script: skip - script: tox -e release - -cache: pip - -install: -- 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-5.0.0/CHANGES.rst new/jaraco.itertools-6.2.1/CHANGES.rst --- old/jaraco.itertools-5.0.0/CHANGES.rst 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/CHANGES.rst 2022-02-21 04:01:24.000000000 +0100 @@ -1,3 +1,44 @@ +v6.2.1 +====== + +#15: Fixed broken test in ``ensure_unique``. + +v6.2.0 +====== + +Added ``accumulate`` function. + +v6.1.1 +====== + +Fixed typo in ``ensure_unique`` doctest. + +v6.1.0 +====== + +Add ``ensure_unique`` function. + +v6.0.3 +====== + +#13: Fixed doc build errors. + +v6.0.2 +====== + +Minor fixes. + +v6.0.1 +====== + +Switch to PEP 420 for namespace package. + +v6.0.0 +====== + +Remove ``Counter.GetCount``. +Remove ``flatten`` and ``iflatten``. + v5.0.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/LICENSE new/jaraco.itertools-6.2.1/LICENSE --- old/jaraco.itertools-5.0.0/LICENSE 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/LICENSE 2022-02-21 04:01:24.000000000 +0100 @@ -1,7 +1,19 @@ 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: +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 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. +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-5.0.0/PKG-INFO new/jaraco.itertools-6.2.1/PKG-INFO --- old/jaraco.itertools-5.0.0/PKG-INFO 2019-12-20 05:36:30.418280400 +0100 +++ new/jaraco.itertools-6.2.1/PKG-INFO 2022-02-21 04:01:47.201205000 +0100 @@ -1,34 +1,42 @@ Metadata-Version: 2.1 Name: jaraco.itertools -Version: 5.0.0 +Version: 6.2.1 Summary: jaraco.itertools Home-page: https://github.com/jaraco/jaraco.itertools Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.itertools.svg - :target: https://pypi.org/project/jaraco.itertools - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg - - .. image:: https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg - :target: https://travis-ci.org/jaraco/jaraco.itertools - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master - - .. 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 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 -Requires-Python: >=3.6 +Classifier: Programming Language :: Python :: 3 :: Only +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.itertools.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.itertools + +.. image:: https://github.com/jaraco/jaraco.itertools/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.itertools/actions?query=workflow%3A%22test… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracoitertools/badge/?version=latest + :target: https://jaracoitertools.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/README.rst new/jaraco.itertools-6.2.1/README.rst --- old/jaraco.itertools-5.0.0/README.rst 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/README.rst 2022-02-21 04:01:24.000000000 +0100 @@ -1,17 +1,21 @@ .. image:: https://img.shields.io/pypi/v/jaraco.itertools.svg - :target: https://pypi.org/project/jaraco.itertools + :target: `PyPI link`_ .. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg + :target: `PyPI link`_ -.. image:: https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg - :target: https://travis-ci.org/jaraco/jaraco.itertools +.. _PyPI link: https://pypi.org/project/jaraco.itertools + +.. image:: https://github.com/jaraco/jaraco.itertools/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.itertools/actions?query=workflow%3A%22test… + :alt: tests .. image:: https://img.shields.io/badge/code%20style-black-000000.svg :target: https://github.com/psf/black :alt: Code style: Black -.. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg -.. :target: https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master - .. image:: https://readthedocs.org/projects/jaracoitertools/badge/?version=latest :target: https://jaracoitertools.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/appveyor.yml new/jaraco.itertools-6.2.1/appveyor.yml --- old/jaraco.itertools-5.0.0/appveyor.yml 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -environment: - - APPVEYOR: true - - matrix: - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python38-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 -U tox tox-venv virtualenv" - - "tox" - -version: '{build}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/conftest.py new/jaraco.itertools-6.2.1/conftest.py --- old/jaraco.itertools-5.0.0/conftest.py 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/conftest.py 2022-02-21 04:01:24.000000000 +0100 @@ -1,12 +1,12 @@ -import six +import sys def pytest_collection_modifyitems(session, config, items): - remove_PY2_broken_tests(items) + remove_broken_tests(items) -def remove_PY2_broken_tests(items): - if six.PY3: - return - broken_test_names = ['jaraco.itertools.always_iterable'] - items[:] = (item for item in items if item.name not in broken_test_names) +def remove_broken_tests(items): + # Remove broken tests for PyPy3 + if hasattr(sys, 'pypy_version_info'): + broken_test_names = ['jaraco.itertools.always_iterable'] + items[:] = (item for item in items if item.name not in broken_test_names) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/docs/conf.py new/jaraco.itertools-6.2.1/docs/conf.py --- old/jaraco.itertools-5.0.0/docs/conf.py 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/docs/conf.py 2022-02-21 04:01:24.000000000 +0100 @@ -14,7 +14,7 @@ url='{package_url}/issues/{issue}', ), dict( - pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n', + pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)', with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n', ), dict( @@ -28,3 +28,13 @@ ], ) } + +# Be strict about any broken references: +nitpicky = True + +# Include Python intersphinx mapping to prevent failures +# jaraco/skeleton#51 +extensions += ['sphinx.ext.intersphinx'] +intersphinx_mapping = { + 'python': ('https://docs.python.org/3', None), +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/docs/index.rst new/jaraco.itertools-6.2.1/docs/index.rst --- old/jaraco.itertools-5.0.0/docs/index.rst 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/docs/index.rst 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,5 @@ -Welcome to jaraco.itertools documentation! -========================================== +Welcome to |project| documentation! +=================================== .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/jaraco/__init__.py new/jaraco.itertools-6.2.1/jaraco/__init__.py --- old/jaraco.itertools-5.0.0/jaraco/__init__.py 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/jaraco/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/jaraco/itertools.py new/jaraco.itertools-6.2.1/jaraco/itertools.py --- old/jaraco.itertools-5.0.0/jaraco/itertools.py 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/jaraco/itertools.py 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,3 @@ -# -*- coding: UTF-8 -*- - """ jaraco.itertools Tools for working with iterables. Complements itertools and more_itertools. @@ -69,7 +67,7 @@ return queues.get_first_n_queues(2) -class GroupbySaved(object): +class GroupbySaved: """ Split a sequence into n sequences where n is determined by the number of distinct values returned by a key function applied to each @@ -172,8 +170,6 @@ self._fetcher() return self.get() - next = __next__ - def __iter__(self): while True: try: @@ -185,7 +181,7 @@ self.put_nowait(item) -class Count(object): +class Count: """ A stop object that will count how many times it's been called and return False on the N+1st call. Useful for use with takewhile. @@ -237,7 +233,7 @@ return vars(self) == vars(other) -class islice(object): +class islice: """May be applied to an iterable to limit the number of items returned. Works similarly to count, except is called only once on an iterable. Functionality is identical to islice, except for __str__ and reusability. @@ -283,7 +279,7 @@ return result -class LessThanNBlanks(object): +class LessThanNBlanks: """ An object that when called will return True until n false elements are encountered. @@ -312,7 +308,7 @@ return self.count < self.limit -class LessThanNConsecutiveBlanks(object): +class LessThanNConsecutiveBlanks: """ An object that when called will return True until n consecutive false elements are encountered. @@ -342,7 +338,7 @@ return self.count < self.limit -class splitter(object): +class splitter: """ object that will split a string with the given arguments for each call. @@ -399,12 +395,14 @@ return infinite_call(functools.partial(f, *args)) -class Counter(object): +class Counter: """ Wrap an iterable in an object that stores the count of items that pass through it. >>> items = Counter(range(20)) + >>> items.count + 0 >>> values = list(items) >>> items.count 20 @@ -412,71 +410,16 @@ def __init__(self, i): self.count = 0 - self._orig_iter = iter(i) + self.iter = zip(itertools.count(1), i) def __iter__(self): return self def __next__(self): - result = next(self._orig_iter) - self.count += 1 - return result - - next = __next__ - - def GetCount(self): - warnings.warn("Use count attribute directly", DeprecationWarning, stacklevel=2) - return self.count - - -# todo, factor out caching capability - - -class iterable_test(dict): - def __init__(self, ignore_classes=(str, bytes)): - """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 {str} <= set(ignore_classes), 'str must be in ignore_classes' - self.ignore_classes = ignore_classes - - def __getitem__(self, candidate): - return dict.get(self, type(candidate)) or self._test(candidate) - - def _test(self, candidate): - try: - if isinstance(candidate, tuple(self.ignore_classes)): - raise TypeError - iter(candidate) - result = True - except TypeError: - result = False - self[type(candidate)] = result + self.count, result = next(self.iter) return result -def iflatten(subject, test=None): - if test is None: - test = iterable_test() - if not test[subject]: - yield subject - else: - for elem in subject: - for subelem in iflatten(elem, test): - yield subelem - - -def flatten(subject, test=None): - """ - *Deprecated*: Use more_itertools.collapse instead. - """ - warnings.warn( - "Use more_itertools.collapse instead", DeprecationWarning, stacklevel=2 - ) - return list(more_itertools.collapse(subject, base_type=(bytes,))) - - def empty(): """ An empty iterator. @@ -501,7 +444,7 @@ return False -class Reusable(object): +class Reusable: """ An iterator that may be reset and reused. @@ -543,8 +486,6 @@ self.reset() raise - next = __next__ - def every_other(iterable): """ @@ -606,7 +547,7 @@ return next(peeker), original -class Peekable(object): +class Peekable: """ Wrapper for a traditional iterable to give it a peek attribute. @@ -649,8 +590,6 @@ def __next__(self): return next(self.iterator) - next = __next__ - def peek(self): result, self.iterator = peek(self.iterator) return result @@ -772,7 +711,7 @@ >>> next(numbers) 2 """ - result, = item + (result,) = item return result @@ -816,7 +755,7 @@ return zip(pre_iter, iter, post_iter) -class IterSaver(object): +class IterSaver: def __init__(self, n, iterable): self.n = n self.iterable = iterable @@ -827,8 +766,6 @@ self.buffer.append(next(self.iterable)) return self.buffer.popleft() - next = __next__ - def partition_items(count, bin_size): """ @@ -970,7 +907,7 @@ 'a' """ try: - single, = sequence + (single,) = sequence except ValueError: return sequence return single @@ -1050,7 +987,9 @@ ) for pair in more_itertools.pairwise(iterable): keyed = tuple(map(key, pair)) - assert comp(*keyed), err_tmpl.format(**locals()) + # cannot use bare assert due to jaraco/jaraco.test#3 + if not comp(*keyed): + raise AssertionError(err_tmpl.format(**locals())) yield pair[0] yield pair[1] @@ -1065,7 +1004,7 @@ - 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 + appear, giving preference to new Items match based on the 'key' parameter (identity by default). @@ -1214,7 +1153,7 @@ """ def unmatched(pair): - test_key, item, = pair + test_key, item = pair return test_key != key items_iter = iter(items.items()) @@ -1222,3 +1161,55 @@ left = collections.OrderedDict(itertools.takewhile(unmatched, items_iter)) right = collections.OrderedDict(items_iter) return left, item, right + + +def ensure_unique(iterable, key=lambda x: x): + """ + Wrap an iterable to raise a ValueError if non-unique values are encountered. + + >>> from more_itertools import consume + >>> list(ensure_unique('abc')) + ['a', 'b', 'c'] + >>> consume(ensure_unique('abca')) + Traceback (most recent call last): + ... + ValueError: Duplicate element 'a' encountered. + """ + seen = set() + seen_add = seen.add + for element in iterable: + k = key(element) + if k in seen: + raise ValueError(f"Duplicate element {element!r} encountered.") + seen_add(k) + yield element + + +def accumulate(increments): + """ + Accumulate values in the iterable into a new iterable + of the same length. + + >>> list(accumulate([1, 2, 3])) + [1, 3, 6] + >>> list(accumulate([0.5, -1, 20])) + [0.5, -0.5, 19.5] + >>> list(accumulate([])) + [] + >>> list(accumulate([42])) + [42] + + Accepts any objects that are summable. + + >>> list(accumulate('abcde')) + ['a', 'ab', 'abc', 'abcd', 'abcde'] + """ + items_ = iter(increments) + try: + value = next(items_) + except StopIteration: + return + yield value + for item in items_: + value += item + yield value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/PKG-INFO new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/PKG-INFO --- old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/PKG-INFO 2019-12-20 05:36:30.000000000 +0100 +++ new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/PKG-INFO 2022-02-21 04:01:46.000000000 +0100 @@ -1,34 +1,42 @@ Metadata-Version: 2.1 Name: jaraco.itertools -Version: 5.0.0 +Version: 6.2.1 Summary: jaraco.itertools Home-page: https://github.com/jaraco/jaraco.itertools Author: Jason R. Coombs Author-email: jaraco(a)jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.itertools.svg - :target: https://pypi.org/project/jaraco.itertools - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg - - .. image:: https://img.shields.io/travis/jaraco/jaraco.itertools/master.svg - :target: https://travis-ci.org/jaraco/jaraco.itertools - - .. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code style: Black - - .. .. image:: https://img.shields.io/appveyor/ci/jaraco/jaraco.itertools/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco.itertools/branch/master - - .. 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 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License Classifier: Programming Language :: Python :: 3 -Requires-Python: >=3.6 +Classifier: Programming Language :: Python :: 3 :: Only +Requires-Python: >=3.7 Provides-Extra: testing Provides-Extra: docs +License-File: LICENSE + +.. image:: https://img.shields.io/pypi/v/jaraco.itertools.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.itertools.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.itertools + +.. image:: https://github.com/jaraco/jaraco.itertools/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.itertools/actions?query=workflow%3A%22test… + :alt: tests + +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black + :alt: Code style: Black + +.. image:: https://readthedocs.org/projects/jaracoitertools/badge/?version=latest + :target: https://jaracoitertools.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/SOURCES.txt new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/SOURCES.txt --- old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/SOURCES.txt 2019-12-20 05:36:30.000000000 +0100 +++ new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/SOURCES.txt 2022-02-21 04:01:47.000000000 +0100 @@ -1,23 +1,22 @@ .coveragerc +.editorconfig .flake8 .pre-commit-config.yaml .readthedocs.yml -.travis.yml CHANGES.rst LICENSE README.rst -appveyor.yml conftest.py +mypy.ini pyproject.toml pytest.ini setup.cfg -setup.py -skeleton.md tox.ini +.github/dependabot.yml +.github/workflows/main.yml docs/conf.py docs/history.rst docs/index.rst -jaraco/__init__.py jaraco/itertools.py jaraco.itertools.egg-info/PKG-INFO jaraco.itertools.egg-info/SOURCES.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/requires.txt new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/requires.txt --- old/jaraco.itertools-5.0.0/jaraco.itertools.egg-info/requires.txt 2019-12-20 05:36:30.000000000 +0100 +++ new/jaraco.itertools-6.2.1/jaraco.itertools.egg-info/requires.txt 2022-02-21 04:01:47.000000000 +0100 @@ -3,12 +3,16 @@ [docs] sphinx -jaraco.packaging>=3.2 +jaraco.packaging>=9 rst.linker>=1.9 [testing] -pytest!=3.7.3,>=3.5 -pytest-checkdocs>=1.2.3 +pytest>=6 +pytest-checkdocs>=2.4 pytest-flake8 -pytest-black-multipy pytest-cov +pytest-enabler>=1.0.1 + +[testing:platform_python_implementation != "PyPy"] +pytest-black>=0.3.7 +pytest-mypy>=0.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/mypy.ini new/jaraco.itertools-6.2.1/mypy.ini --- old/jaraco.itertools-5.0.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.itertools-6.2.1/mypy.ini 2022-02-21 04:01:24.000000000 +0100 @@ -0,0 +1,2 @@ +[mypy] +ignore_missing_imports = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/pyproject.toml new/jaraco.itertools-6.2.1/pyproject.toml --- old/jaraco.itertools-5.0.0/pyproject.toml 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/pyproject.toml 2022-02-21 04:01:24.000000000 +0100 @@ -1,6 +1,20 @@ [build-system] -requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"] +requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"] build-backend = "setuptools.build_meta" [tool.black] skip-string-normalization = true + +[tool.setuptools_scm] + +[pytest.enabler.black] +addopts = "--black" + +[pytest.enabler.mypy] +addopts = "--mypy" + +[pytest.enabler.flake8] +addopts = "--flake8" + +[pytest.enabler.cov] +addopts = "--cov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/pytest.ini new/jaraco.itertools-6.2.1/pytest.ini --- old/jaraco.itertools-5.0.0/pytest.ini 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/pytest.ini 2022-02-21 04:01:24.000000000 +0100 @@ -1,5 +1,18 @@ [pytest] norecursedirs=dist build .tox .eggs -addopts=--doctest-modules --flake8 --black --cov +# doctests disabled due to pytest-dev/pytest#3396 +# addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES filterwarnings= + # Suppress deprecation warning in flake8 + ignore:SelectableGroups dict interface is deprecated::flake8 + + # shopkeep/pytest-black#55 + ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning + ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning + + # tholo/pytest-flake8#83 + ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning + ignore:The $fspath. py.path.local$ argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning + ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/setup.cfg new/jaraco.itertools-6.2.1/setup.cfg --- old/jaraco.itertools-5.0.0/setup.cfg 2019-12-20 05:36:30.418280400 +0100 +++ new/jaraco.itertools-6.2.1/setup.cfg 2022-02-21 04:01:47.201205000 +0100 @@ -1,8 +1,4 @@ -[bdist_wheel] -universal = 1 - [metadata] -license_file = LICENSE name = jaraco.itertools author = Jason R. Coombs author_email = jaraco(a)jaraco.com @@ -14,26 +10,37 @@ Intended Audience :: Developers License :: OSI Approved :: MIT License Programming Language :: Python :: 3 + Programming Language :: Python :: 3 :: Only [options] -packages = find: +packages = find_namespace: include_package_data = true -python_requires = >=3.6 +python_requires = >=3.7 install_requires = more_itertools>=4.0.0 inflect -setup_requires = setuptools_scm >= 1.15.0 + +[options.packages.find] +exclude = + build* + dist* + docs* + tests* [options.extras_require] testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs >= 1.2.3 + pytest >= 6 + pytest-checkdocs >= 2.4 pytest-flake8 - pytest-black-multipy + pytest-black >= 0.3.7; \ + python_implementation != "PyPy" pytest-cov + pytest-mypy >= 0.9.1; \ + python_implementation != "PyPy" + pytest-enabler >= 1.0.1 docs = sphinx - jaraco.packaging >= 3.2 + jaraco.packaging >= 9 rst.linker >= 1.9 [options.entry_points] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/setup.py new/jaraco.itertools-6.2.1/setup.py --- old/jaraco.itertools-5.0.0/setup.py 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import setuptools - -if __name__ == "__main__": - setuptools.setup(use_scm_version=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/skeleton.md new/jaraco.itertools-6.2.1/skeleton.md --- old/jaraco.itertools-5.0.0/skeleton.md 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/skeleton.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -# 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. - -Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8c… would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton. - -# 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 -- Use of [black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier) - -## 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 `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: - -- disable mutually incompatible rules W503 and W504 -- support for black format - -## 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. - -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). - -### Continuous Deployments - -In addition to running tests, an additional deploy stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with Travis as the TWINE_PASSWORD environment variable. After the Travis project is created, configure the token through the web UI or with a command like the following (bash syntax): - -``` -TWINE_PASSWORD={token} travis env copy TWINE_PASSWORD -``` - -## 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 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. - -Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD: - -``` -TWINE_PASSWORD={token} tox -e release -``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.itertools-5.0.0/tox.ini new/jaraco.itertools-6.2.1/tox.ini --- old/jaraco.itertools-5.0.0/tox.ini 2019-12-20 05:36:10.000000000 +0100 +++ new/jaraco.itertools-6.2.1/tox.ini 2022-02-21 04:01:24.000000000 +0100 @@ -3,16 +3,11 @@ minversion = 3.2 # https://github.com/jaraco/skeleton/issues/6 tox_pip_extensions_ext_venv_update = true -# Ensure that a late version of pip is used even on tox-venv. -requires = - tox-pip-version>=0.0.6 - tox-venv +toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] deps = - setuptools>=31.0.1 -pip_version = pip commands = pytest {posargs} usedevelop = True @@ -24,19 +19,21 @@ testing changedir = docs commands = - python -m sphinx . {toxinidir}/build/html + python -m sphinx -W --keep-going . {toxinidir}/build/html [testenv:release] skip_install = True deps = - pep517>=0.5 - twine[keyring]>=1.13 - path + build + twine>=3 + jaraco.develop>=7.1 passenv = TWINE_PASSWORD + GITHUB_TOKEN setenv = TWINE_USERNAME = {env:TWINE_USERNAME:__token__} commands = - python -c "import path; path.Path('dist').rmtree_p()" - python -m pep517.build . + python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)" + python -m build python -m twine upload dist/* + python -m jaraco.develop.create-github-release

1 0