Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-jaraco.text for
openSUSE:Factory checked in at 2021-05-20 19:23:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jaraco.text (Old)
and /work/SRC/openSUSE:Factory/.python-jaraco.text.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jaraco.text"
Thu May 20 19:23:11 2021 rev:6 rq:893337 version:3.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jaraco.text/python-jaraco.text.changes
2020-04-19 21:40:41.635024300 +0200
+++
/work/SRC/openSUSE:Factory/.python-jaraco.text.new.2988/python-jaraco.text.changes
2021-05-20 19:23:21.258369982 +0200
@@ -1,0 +2,16 @@
+Sat May 15 17:25:42 UTC 2021 - Arun Persaud <a...@gmx.de>
+
+- specfile:
+ * update copyright year
+ * skip python2
+
+- update to version 3.5.0:
+ * Rely on PEP 420 for namespace package.
+
+- changes from version 3.4.0:
+ * Added WordSet.trim* methods.
+
+- changes from version 3.3.0:
+ * Require Python 3.6 or later.
+
+-------------------------------------------------------------------
Old:
----
jaraco.text-3.2.0.tar.gz
New:
----
jaraco.text-3.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jaraco.text.spec ++++++
--- /var/tmp/diff_new_pack.5oF1NB/_old 2021-05-20 19:23:22.590364347 +0200
+++ /var/tmp/diff_new_pack.5oF1NB/_new 2021-05-20 19:23:22.594364329 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-jaraco.text
#
-# 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
@@ -17,8 +17,9 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-jaraco.text
-Version: 3.2.0
+Version: 3.5.0
Release: 0
Summary: Tools to work with text
License: MIT
++++++ jaraco.text-3.2.0.tar.gz -> jaraco.text-3.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/.flake8
new/jaraco.text-3.5.0/.flake8
--- old/jaraco.text-3.2.0/.flake8 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/.flake8 2021-02-11 02:17:00.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.text-3.2.0/.github/workflows/automerge.yml
new/jaraco.text-3.5.0/.github/workflows/automerge.yml
--- old/jaraco.text-3.2.0/.github/workflows/automerge.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/jaraco.text-3.5.0/.github/workflows/automerge.yml 2021-02-11
02:17:00.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/automerge-action@v0.12.0"
+ env:
+ GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/.github/workflows/main.yml
new/jaraco.text-3.5.0/.github/workflows/main.yml
--- old/jaraco.text-3.2.0/.github/workflows/main.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/jaraco.text-3.5.0/.github/workflows/main.yml 2021-02-11
02:17:00.000000000 +0100
@@ -0,0 +1,42 @@
+name: tests
+
+on: [push, pull_request]
+
+jobs:
+ test:
+ strategy:
+ matrix:
+ python: [3.6, 3.8, 3.9]
+ 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.9
+ - 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.text-3.2.0/.pre-commit-config.yaml
new/jaraco.text-3.5.0/.pre-commit-config.yaml
--- old/jaraco.text-3.2.0/.pre-commit-config.yaml 2019-12-01
18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/.pre-commit-config.yaml 2021-02-11
02:17:00.000000000 +0100
@@ -1,5 +1,10 @@
repos:
- repo: https://github.com/psf/black
- rev: 19.3b0
+ rev: 20.8b1
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.text-3.2.0/.readthedocs.yml
new/jaraco.text-3.5.0/.readthedocs.yml
--- old/jaraco.text-3.2.0/.readthedocs.yml 2019-12-01 18:38:50.000000000
+0100
+++ new/jaraco.text-3.5.0/.readthedocs.yml 2021-02-11 02:17:00.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.text-3.2.0/.travis.yml
new/jaraco.text-3.5.0/.travis.yml
--- old/jaraco.text-3.2.0/.travis.yml 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-dist: xenial
-language: python
-
-python:
-- 2.7
-- 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.text-3.2.0/CHANGES.rst
new/jaraco.text-3.5.0/CHANGES.rst
--- old/jaraco.text-3.2.0/CHANGES.rst 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/CHANGES.rst 2021-02-11 02:17:00.000000000 +0100
@@ -1,3 +1,18 @@
+v3.5.0
+======
+
+Rely on PEP 420 for namespace package.
+
+v3.4.0
+======
+
+Added ``WordSet.trim*`` methods.
+
+v3.3.0
+======
+
+Require Python 3.6 or later.
+
v3.2.0
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/LICENSE
new/jaraco.text-3.5.0/LICENSE
--- old/jaraco.text-3.2.0/LICENSE 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/LICENSE 2021-02-11 02:17:00.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.text-3.2.0/PKG-INFO
new/jaraco.text-3.5.0/PKG-INFO
--- old/jaraco.text-3.2.0/PKG-INFO 2019-12-01 18:39:17.240367000 +0100
+++ new/jaraco.text-3.5.0/PKG-INFO 2021-02-11 02:17:26.365527900 +0100
@@ -1,26 +1,27 @@
Metadata-Version: 2.1
Name: jaraco.text
-Version: 3.2.0
+Version: 3.5.0
Summary: Module for text manipulation
Home-page: https://github.com/jaraco/jaraco.text
Author: Jason R. Coombs
Author-email: jar...@jaraco.com
License: UNKNOWN
Description: .. image:: https://img.shields.io/pypi/v/jaraco.text.svg
- :target: https://pypi.org/project/jaraco.text
+ :target: `PyPI link`_
.. image:: https://img.shields.io/pypi/pyversions/jaraco.text.svg
+ :target: `PyPI link`_
- .. image:: https://img.shields.io/travis/jaraco/jaraco.text/master.svg
- :target: https://travis-ci.org/jaraco/jaraco.text
+ .. _PyPI link: https://pypi.org/project/jaraco.text
+
+ .. image::
https://github.com/jaraco/jaraco.text/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/jaraco.text/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://img.shields.io/appveyor/ci/jaraco/jaraco-text/master.svg
- .. :target:
https://ci.appveyor.com/project/jaraco/jaraco-text/branch/master
-
.. image::
https://readthedocs.org/projects/jaracotext/badge/?version=latest
:target: https://jaracotext.readthedocs.io/en/latest/?badge=latest
@@ -28,8 +29,8 @@
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Requires-Python: >=2.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.6
Provides-Extra: testing
Provides-Extra: docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/README.rst
new/jaraco.text-3.5.0/README.rst
--- old/jaraco.text-3.2.0/README.rst 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/README.rst 2021-02-11 02:17:00.000000000 +0100
@@ -1,17 +1,18 @@
.. image:: https://img.shields.io/pypi/v/jaraco.text.svg
- :target: https://pypi.org/project/jaraco.text
+ :target: `PyPI link`_
.. image:: https://img.shields.io/pypi/pyversions/jaraco.text.svg
+ :target: `PyPI link`_
-.. image:: https://img.shields.io/travis/jaraco/jaraco.text/master.svg
- :target: https://travis-ci.org/jaraco/jaraco.text
+.. _PyPI link: https://pypi.org/project/jaraco.text
+
+.. image:: https://github.com/jaraco/jaraco.text/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/jaraco.text/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://img.shields.io/appveyor/ci/jaraco/jaraco-text/master.svg
-.. :target: https://ci.appveyor.com/project/jaraco/jaraco-text/branch/master
-
.. image:: https://readthedocs.org/projects/jaracotext/badge/?version=latest
:target: https://jaracotext.readthedocs.io/en/latest/?badge=latest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/appveyor.yml
new/jaraco.text-3.5.0/appveyor.yml
--- old/jaraco.text-3.2.0/appveyor.yml 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.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:\\Python27-x64"
-
-install:
- # symlink python from a directory with a space
- - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
- - "SET PYTHON=\"C:\\Program Files\\Python\""
- - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
-build: off
-
-cache:
- - '%LOCALAPPDATA%\pip\Cache'
-
-test_script:
- - "python -m pip install -U tox tox-venv virtualenv"
- - "tox"
-
-version: '{build}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/docs/conf.py
new/jaraco.text-3.5.0/docs/conf.py
--- old/jaraco.text-3.2.0/docs/conf.py 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/docs/conf.py 2021-02-11 02:17:00.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/jaraco.text-3.2.0/docs/index.rst
new/jaraco.text-3.5.0/docs/index.rst
--- old/jaraco.text-3.2.0/docs/index.rst 2019-12-01 18:38:50.000000000
+0100
+++ new/jaraco.text-3.5.0/docs/index.rst 2021-02-11 02:17:00.000000000
+0100
@@ -1,5 +1,5 @@
-Welcome to jaraco.text documentation!
-=====================================
+Welcome to |project| documentation!
+===================================
.. toctree::
:maxdepth: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/jaraco/__init__.py
new/jaraco.text-3.5.0/jaraco/__init__.py
--- old/jaraco.text-3.2.0/jaraco/__init__.py 2019-12-01 18:38:50.000000000
+0100
+++ new/jaraco.text-3.5.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.text-3.2.0/jaraco/text/__init__.py
new/jaraco.text-3.5.0/jaraco/text/__init__.py
--- old/jaraco.text-3.2.0/jaraco/text/__init__.py 2019-12-01
18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/jaraco/text/__init__.py 2021-02-11
02:17:00.000000000 +0100
@@ -1,16 +1,12 @@
-from __future__ import absolute_import, unicode_literals, print_function
-
import re
import itertools
import textwrap
import functools
-import six
-
try:
- from importlib import resources
+ from importlib import resources # type: ignore
except ImportError: # pragma: nocover
- import importlib_resources as resources
+ import importlib_resources as resources # type: ignore
from jaraco.functools import compose, method_cache
@@ -37,7 +33,7 @@
return compose(*substitutions)
-class FoldedCase(six.text_type):
+class FoldedCase(str):
"""
A case insensitive string class; behaves just like str
except compares equal when the only variation is case.
@@ -229,7 +225,7 @@
return '\n'.join(cleaned)
-lorem_ipsum = resources.read_text(__name__, 'Lorem ipsum.txt')
+lorem_ipsum = resources.read_text(__name__, 'Lorem ipsum.txt') # type: ignore
class Splitter(object):
@@ -257,7 +253,7 @@
class WordSet(tuple):
"""
- Given a Python identifier, return the words that identifier represents,
+ Given an identifier, return the words that identifier represents,
whether in camel case, underscore-separated, etc.
>>> WordSet.parse("camelCase")
@@ -335,6 +331,39 @@
def space_separated(self):
return ' '.join(self)
+ def trim_right(self, item):
+ """
+ Remove the item from the end of the set.
+
+ >>> WordSet.parse('foo bar').trim_right('foo')
+ ('foo', 'bar')
+ >>> WordSet.parse('foo bar').trim_right('bar')
+ ('foo',)
+ >>> WordSet.parse('').trim_right('bar')
+ ()
+ """
+ return self[:-1] if self and self[-1] == item else self
+
+ def trim_left(self, item):
+ """
+ Remove the item from the beginning of the set.
+
+ >>> WordSet.parse('foo bar').trim_left('foo')
+ ('bar',)
+ >>> WordSet.parse('foo bar').trim_left('bar')
+ ('foo', 'bar')
+ >>> WordSet.parse('').trim_left('bar')
+ ()
+ """
+ return self[1:] if self and self[0] == item else self
+
+ def trim(self, item):
+ """
+ >>> WordSet.parse('foo bar').trim('foo')
+ ('bar',)
+ """
+ return self.trim_left(item).trim_right(item)
+
def __getitem__(self, item):
result = super(WordSet, self).__getitem__(item)
if isinstance(item, slice):
@@ -381,7 +410,7 @@
return ''.join(texts)
-class SeparatedValues(six.text_type):
+class SeparatedValues(str):
"""
A string separated by a separator. Overrides __iter__ for getting
the values.
@@ -399,7 +428,7 @@
def __iter__(self):
parts = self.split(self.separator)
- return six.moves.filter(None, (part.strip() for part in parts))
+ return filter(None, (part.strip() for part in parts))
class Stripper:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/jaraco.text.egg-info/PKG-INFO
new/jaraco.text-3.5.0/jaraco.text.egg-info/PKG-INFO
--- old/jaraco.text-3.2.0/jaraco.text.egg-info/PKG-INFO 2019-12-01
18:39:16.000000000 +0100
+++ new/jaraco.text-3.5.0/jaraco.text.egg-info/PKG-INFO 2021-02-11
02:17:26.000000000 +0100
@@ -1,26 +1,27 @@
Metadata-Version: 2.1
Name: jaraco.text
-Version: 3.2.0
+Version: 3.5.0
Summary: Module for text manipulation
Home-page: https://github.com/jaraco/jaraco.text
Author: Jason R. Coombs
Author-email: jar...@jaraco.com
License: UNKNOWN
Description: .. image:: https://img.shields.io/pypi/v/jaraco.text.svg
- :target: https://pypi.org/project/jaraco.text
+ :target: `PyPI link`_
.. image:: https://img.shields.io/pypi/pyversions/jaraco.text.svg
+ :target: `PyPI link`_
- .. image:: https://img.shields.io/travis/jaraco/jaraco.text/master.svg
- :target: https://travis-ci.org/jaraco/jaraco.text
+ .. _PyPI link: https://pypi.org/project/jaraco.text
+
+ .. image::
https://github.com/jaraco/jaraco.text/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/jaraco.text/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://img.shields.io/appveyor/ci/jaraco/jaraco-text/master.svg
- .. :target:
https://ci.appveyor.com/project/jaraco/jaraco-text/branch/master
-
.. image::
https://readthedocs.org/projects/jaracotext/badge/?version=latest
:target: https://jaracotext.readthedocs.io/en/latest/?badge=latest
@@ -28,8 +29,8 @@
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Requires-Python: >=2.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.6
Provides-Extra: testing
Provides-Extra: docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/jaraco.text.egg-info/SOURCES.txt
new/jaraco.text-3.5.0/jaraco.text.egg-info/SOURCES.txt
--- old/jaraco.text-3.2.0/jaraco.text.egg-info/SOURCES.txt 2019-12-01
18:39:17.000000000 +0100
+++ new/jaraco.text-3.5.0/jaraco.text.egg-info/SOURCES.txt 2021-02-11
02:17:26.000000000 +0100
@@ -2,21 +2,21 @@
.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/workflows/automerge.yml
+.github/workflows/main.yml
docs/conf.py
docs/history.rst
docs/index.rst
-jaraco/__init__.py
jaraco.text.egg-info/PKG-INFO
jaraco.text.egg-info/SOURCES.txt
jaraco.text.egg-info/dependency_links.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/jaraco.text.egg-info/requires.txt
new/jaraco.text-3.5.0/jaraco.text.egg-info/requires.txt
--- old/jaraco.text-3.2.0/jaraco.text.egg-info/requires.txt 2019-12-01
18:39:16.000000000 +0100
+++ new/jaraco.text-3.5.0/jaraco.text.egg-info/requires.txt 2021-02-11
02:17:26.000000000 +0100
@@ -1,17 +1,20 @@
jaraco.functools
-six
[:python_version < "3.7"]
importlib_resources
[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-flake8
-pytest-black-multipy
pytest-cov
+pytest-enabler
+
+[testing:platform_python_implementation != "PyPy"]
+pytest-black>=0.3.7
+pytest-mypy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/jaraco.text.egg-info/top_level.txt
new/jaraco.text-3.5.0/jaraco.text.egg-info/top_level.txt
--- old/jaraco.text-3.2.0/jaraco.text.egg-info/top_level.txt 2019-12-01
18:39:16.000000000 +0100
+++ new/jaraco.text-3.5.0/jaraco.text.egg-info/top_level.txt 2021-02-11
02:17:26.000000000 +0100
@@ -1 +1,2 @@
+dist
jaraco
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/mypy.ini
new/jaraco.text-3.5.0/mypy.ini
--- old/jaraco.text-3.2.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/jaraco.text-3.5.0/mypy.ini 2021-02-11 02:17:00.000000000 +0100
@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/pyproject.toml
new/jaraco.text-3.5.0/pyproject.toml
--- old/jaraco.text-3.2.0/pyproject.toml 2019-12-01 18:38:50.000000000
+0100
+++ new/jaraco.text-3.5.0/pyproject.toml 2021-02-11 02:17:00.000000000
+0100
@@ -1,6 +1,20 @@
[build-system]
-requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
+requires = ["setuptools>=42", "wheel", "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.text-3.2.0/pytest.ini
new/jaraco.text-3.5.0/pytest.ini
--- old/jaraco.text-3.2.0/pytest.ini 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/pytest.ini 2021-02-11 02:17:00.000000000 +0100
@@ -1,5 +1,9 @@
[pytest]
norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8 --black --cov
+addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+# 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/jaraco.text-3.2.0/setup.cfg
new/jaraco.text-3.5.0/setup.cfg
--- old/jaraco.text-3.2.0/setup.cfg 2019-12-01 18:39:17.240367000 +0100
+++ new/jaraco.text-3.5.0/setup.cfg 2021-02-11 02:17:26.365527900 +0100
@@ -1,8 +1,6 @@
-[bdist_wheel]
-universal = 1
-
[metadata]
-license_file = LICENSE
+license_files =
+ LICENSE
name = jaraco.text
author = Jason R. Coombs
author_email = jar...@jaraco.com
@@ -13,29 +11,36 @@
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
License :: OSI Approved :: MIT License
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
+ Programming Language :: Python :: 3 :: Only
[options]
-packages = find:
+packages = find_namespace:
include_package_data = true
-python_requires = >=2.7
+python_requires = >=3.6
install_requires =
jaraco.functools
- six
importlib_resources; python_version < "3.7"
-setup_requires = setuptools_scm >= 1.15.0
+setup_requires = setuptools_scm[toml] >= 3.4.1
+
+[options.packages.find]
+exclude =
+ build*
+ docs*
+ tests*
[options.extras_require]
testing =
pytest >= 3.5, !=3.7.3
pytest-checkdocs >= 1.2.3
pytest-flake8
- pytest-black-multipy
+ pytest-black >= 0.3.7; python_implementation != "PyPy"
pytest-cov
+ pytest-mypy; python_implementation != "PyPy"
+ pytest-enabler
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/jaraco.text-3.2.0/setup.py
new/jaraco.text-3.5.0/setup.py
--- old/jaraco.text-3.2.0/setup.py 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/setup.py 2021-02-11 02:17:00.000000000 +0100
@@ -3,4 +3,4 @@
import setuptools
if __name__ == "__main__":
- setuptools.setup(use_scm_version=True)
+ setuptools.setup()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/skeleton.md
new/jaraco.text-3.5.0/skeleton.md
--- old/jaraco.text-3.2.0/skeleton.md 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/skeleton.md 2021-02-11 02:17:00.000000000 +0100
@@ -2,9 +2,9 @@
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
+## 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.
+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.
@@ -38,24 +38,49 @@
## 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.
+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
+- 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 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)
+- 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).
+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:
@@ -92,39 +117,43 @@
- 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.
+- 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:
+Relies on a .flake8 file to correct some default behaviors:
- disable mutually incompatible rules W503 and W504
-- support for black format
+- 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.
+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 Python 2 and 3
-- run on Ubuntu Xenial
-- correct for broken IPv6
+- 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))
-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):
+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/encrypted-secrets).
Example:
```
-TWINE_PASSWORD={token} travis env copy TWINE_PASSWORD
+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.
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-3.2.0/tox.ini
new/jaraco.text-3.5.0/tox.ini
--- old/jaraco.text-3.2.0/tox.ini 2019-12-01 18:38:50.000000000 +0100
+++ new/jaraco.text-3.5.0/tox.ini 2021-02-11 02:17:00.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
@@ -29,14 +24,17 @@
[testenv:release]
skip_install = True
deps =
- pep517>=0.5
+ build
twine[keyring]>=1.13
path
+ 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 -m build
python -m twine upload dist/*
+ python -m jaraco.develop.create-github-release
![https://raw.githubusercontent.com/jaraco/skeleton/gh-pages/docs/refresh.svg"](https://raw.githubusercontent.com/jaraco/skeleton/gh-pages/docs/refresh.svg"){kind=link}