Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-zipp for openSUSE:Factory checked in at 2021-03-12 13:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-zipp (Old) and /work/SRC/openSUSE:Factory/.python-zipp.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-zipp" Fri Mar 12 13:31:02 2021 rev:11 rq:877636 version:3.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-zipp/python-zipp.changes 2020-11-29 12:26:57.681913158 +0100 +++ /work/SRC/openSUSE:Factory/.python-zipp.new.2401/python-zipp.changes 2021-03-12 13:31:18.638156758 +0100 @@ -1,0 +2,6 @@ +Mon Mar 8 09:07:01 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 3.4.1: + * refresh packaging + +------------------------------------------------------------------- Old: ---- zipp-3.4.0.tar.gz New: ---- zipp-3.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-zipp.spec ++++++ --- /var/tmp/diff_new_pack.nqylfi/_old 2021-03-12 13:31:19.182157521 +0100 +++ /var/tmp/diff_new_pack.nqylfi/_new 2021-03-12 13:31:19.182157521 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-zipp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ %bcond_with test %endif Name: python-zipp%{psuffix} -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: Pathlib-compatible object wrapper for zip files License: MIT ++++++ zipp-3.4.0.tar.gz -> zipp-3.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/.editorconfig new/zipp-3.4.1/.editorconfig --- old/zipp-3.4.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/zipp-3.4.1/.editorconfig 2021-03-05 03:41:41.000000000 +0100 @@ -0,0 +1,15 @@ +root = true + +[*] +charset = utf-8 +indent_style = tab +indent_size = 4 +insert_final_newline = true +end_of_line = lf + +[*.py] +indent_style = space + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/.flake8 new/zipp-3.4.1/.flake8 --- old/zipp-3.4.0/.flake8 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/.flake8 2021-03-05 03:41:41.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/zipp-3.4.0/.github/workflows/automerge.yml new/zipp-3.4.1/.github/workflows/automerge.yml --- old/zipp-3.4.0/.github/workflows/automerge.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/zipp-3.4.1/.github/workflows/automerge.yml 2021-03-05 03:41:41.000000000 +0100 @@ -0,0 +1,27 @@ +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/[email protected]" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/.github/workflows/main.yml new/zipp-3.4.1/.github/workflows/main.yml --- old/zipp-3.4.0/.github/workflows/main.yml 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/.github/workflows/main.yml 2021-03-05 03:41:41.000000000 +0100 @@ -1,4 +1,4 @@ -name: Automated Tests +name: tests on: [push, pull_request] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/.pre-commit-config.yaml new/zipp-3.4.1/.pre-commit-config.yaml --- old/zipp-3.4.0/.pre-commit-config.yaml 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/.pre-commit-config.yaml 2021-03-05 03:41:41.000000000 +0100 @@ -1,10 +1,10 @@ repos: - repo: https://github.com/psf/black - rev: stable + rev: 20.8b1 hooks: - id: black - repo: https://github.com/asottile/blacken-docs - rev: v1.8.0 + rev: v1.9.1 hooks: - id: blacken-docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/CHANGES.rst new/zipp-3.4.1/CHANGES.rst --- old/zipp-3.4.0/CHANGES.rst 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/CHANGES.rst 2021-03-05 03:41:41.000000000 +0100 @@ -1,3 +1,8 @@ +v3.4.1 +====== + +Refresh packaging. + v3.4.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/PKG-INFO new/zipp-3.4.1/PKG-INFO --- old/zipp-3.4.0/PKG-INFO 2020-10-25 19:40:22.124914600 +0100 +++ new/zipp-3.4.1/PKG-INFO 2021-03-05 03:42:05.687941300 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: zipp -Version: 3.4.0 +Version: 3.4.1 Summary: Backport of pathlib-compatible object wrapper for zip files Home-page: https://github.com/jaraco/zipp Author: Jason R. Coombs @@ -14,9 +14,9 @@ .. _PyPI link: https://pypi.org/project/zipp - .. image:: https://github.com/jaraco/zipp/workflows/Automated%20Tests/badge.svg - :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22Automated+Tests%22 - :alt: Automated Tests + .. image:: https://github.com/jaraco/zipp/workflows/tests/badge.svg + :target: https://github.com/jaraco/zipp/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/README.rst new/zipp-3.4.1/README.rst --- old/zipp-3.4.0/README.rst 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/README.rst 2021-03-05 03:41:41.000000000 +0100 @@ -6,9 +6,9 @@ .. _PyPI link: https://pypi.org/project/zipp -.. image:: https://github.com/jaraco/zipp/workflows/Automated%20Tests/badge.svg - :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22Automated+Tests%22 - :alt: Automated Tests +.. image:: https://github.com/jaraco/zipp/workflows/tests/badge.svg + :target: https://github.com/jaraco/zipp/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/docs/conf.py new/zipp-3.4.1/docs/conf.py --- old/zipp-3.4.0/docs/conf.py 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/docs/conf.py 2021-03-05 03:41:41.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( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/docs/index.rst new/zipp-3.4.1/docs/index.rst --- old/zipp-3.4.0/docs/index.rst 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/docs/index.rst 2021-03-05 03:41:41.000000000 +0100 @@ -1,5 +1,5 @@ -Welcome to zipp documentation! -======================================== +Welcome to |project| documentation! +=================================== .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/pyproject.toml new/zipp-3.4.1/pyproject.toml --- old/zipp-3.4.0/pyproject.toml 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/pyproject.toml 2021-03-05 03:41:41.000000000 +0100 @@ -7,16 +7,14 @@ [tool.setuptools_scm] -# jaraco/skeleton#22 -[tool.jaraco.pytest.plugins.black] +[pytest.enabler.black] addopts = "--black" -# jaraco/skeleton#22 -[tool.jaraco.pytest.plugins.mypy] +[pytest.enabler.mypy] addopts = "--mypy" -[tool.jaraco.pytest.plugins.flake8] +[pytest.enabler.flake8] addopts = "--flake8" -[tool.jaraco.pytest.plugins.cov] +[pytest.enabler.cov] addopts = "--cov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/pytest.ini new/zipp-3.4.1/pytest.ini --- old/zipp-3.4.0/pytest.ini 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/pytest.ini 2021-03-05 03:41:41.000000000 +0100 @@ -5,5 +5,3 @@ # workaround for warning pytest-dev/pytest#6178 junit_family=xunit2 filterwarnings= - # https://github.com/pytest-dev/pytest/issues/6928 - ignore:direct construction of .*Item has been deprecated:DeprecationWarning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/setup.cfg new/zipp-3.4.1/setup.cfg --- old/zipp-3.4.0/setup.cfg 2020-10-25 19:40:22.124914600 +0100 +++ new/zipp-3.4.1/setup.cfg 2021-03-05 03:42:05.687941300 +0100 @@ -1,5 +1,6 @@ [metadata] -license_file = LICENSE +license_files = + LICENSE name = zipp author = Jason R. Coombs author_email = [email protected] @@ -14,28 +15,35 @@ Programming Language :: Python :: 3 :: Only [options] +packages = find_namespace: py_modules = zipp -packages = find: include_package_data = true python_requires = >=3.6 install_requires = setup_requires = setuptools_scm[toml] >= 3.4.1 +[options.packages.find] +exclude = + build* + dist* + docs* + tests* + [options.extras_require] testing = - pytest >= 3.5, !=3.7.3 + pytest >= 4.6 pytest-checkdocs >= 1.2.3 pytest-flake8 pytest-black >= 0.3.7; python_implementation != "PyPy" pytest-cov pytest-mypy; python_implementation != "PyPy" - jaraco.test >= 3.2.0 + pytest-enabler jaraco.itertools func-timeout docs = sphinx - jaraco.packaging >= 3.2 + jaraco.packaging >= 8.2 rst.linker >= 1.9 [options.entry_points] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/skeleton.md new/zipp-3.4.1/skeleton.md --- old/zipp-3.4.0/skeleton.md 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/skeleton.md 2021-03-05 03:41:41.000000000 +0100 @@ -46,6 +46,26 @@ 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: @@ -118,6 +138,8 @@ - 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/administering-a-repository/enabling-required-status-checks), [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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/tox.ini new/zipp-3.4.1/tox.ini --- old/zipp-3.4.0/tox.ini 2020-10-25 19:40:04.000000000 +0100 +++ new/zipp-3.4.1/tox.ini 2021-03-05 03:41:41.000000000 +0100 @@ -3,7 +3,7 @@ minversion = 3.2 # https://github.com/jaraco/skeleton/issues/6 tox_pip_extensions_ext_venv_update = true - +toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] deps = @@ -11,6 +11,9 @@ pytest {posargs} usedevelop = True extras = testing +setenv = + # workaround pypa/pip#9143 + PIP_USE_DEPRECATED=legacy-resolver [testenv:docs] extras = @@ -23,7 +26,7 @@ [testenv:release] skip_install = True deps = - pep517>=0.5 + build twine[keyring]>=1.13 path jaraco.develop>=7.1 @@ -34,6 +37,6 @@ TWINE_USERNAME = {env:TWINE_USERNAME:__token__} commands = python -c "import path; path.Path('dist').rmtree_p()" - python -m pep517.build . + python -m build python -m twine upload dist/* python -m jaraco.develop.create-github-release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/zipp.egg-info/PKG-INFO new/zipp-3.4.1/zipp.egg-info/PKG-INFO --- old/zipp-3.4.0/zipp.egg-info/PKG-INFO 2020-10-25 19:40:21.000000000 +0100 +++ new/zipp-3.4.1/zipp.egg-info/PKG-INFO 2021-03-05 03:42:05.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: zipp -Version: 3.4.0 +Version: 3.4.1 Summary: Backport of pathlib-compatible object wrapper for zip files Home-page: https://github.com/jaraco/zipp Author: Jason R. Coombs @@ -14,9 +14,9 @@ .. _PyPI link: https://pypi.org/project/zipp - .. image:: https://github.com/jaraco/zipp/workflows/Automated%20Tests/badge.svg - :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22Automated+Tests%22 - :alt: Automated Tests + .. image:: https://github.com/jaraco/zipp/workflows/tests/badge.svg + :target: https://github.com/jaraco/zipp/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/zipp.egg-info/SOURCES.txt new/zipp-3.4.1/zipp.egg-info/SOURCES.txt --- old/zipp-3.4.0/zipp.egg-info/SOURCES.txt 2020-10-25 19:40:22.000000000 +0100 +++ new/zipp-3.4.1/zipp.egg-info/SOURCES.txt 2021-03-05 03:42:05.000000000 +0100 @@ -1,4 +1,5 @@ .coveragerc +.editorconfig .flake8 .pre-commit-config.yaml .readthedocs.yml @@ -15,6 +16,7 @@ test_zipp.py tox.ini zipp.py +.github/workflows/automerge.yml .github/workflows/main.yml docs/conf.py docs/history.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zipp-3.4.0/zipp.egg-info/requires.txt new/zipp-3.4.1/zipp.egg-info/requires.txt --- old/zipp-3.4.0/zipp.egg-info/requires.txt 2020-10-25 19:40:21.000000000 +0100 +++ new/zipp-3.4.1/zipp.egg-info/requires.txt 2021-03-05 03:42:05.000000000 +0100 @@ -1,15 +1,15 @@ [docs] sphinx -jaraco.packaging>=3.2 +jaraco.packaging>=8.2 rst.linker>=1.9 [testing] -pytest!=3.7.3,>=3.5 +pytest>=4.6 pytest-checkdocs>=1.2.3 pytest-flake8 pytest-cov -jaraco.test>=3.2.0 +pytest-enabler jaraco.itertools func-timeout
