Hello community,
here is the log from the commit of package python-jaraco.text for
openSUSE:Factory checked in at 2019-03-26 22:33:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jaraco.text (Old)
and /work/SRC/openSUSE:Factory/.python-jaraco.text.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jaraco.text"
Tue Mar 26 22:33:52 2019 rev:3 rq:688759 version:3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jaraco.text/python-jaraco.text.changes
2019-03-04 09:21:46.708585831 +0100
+++
/work/SRC/openSUSE:Factory/.python-jaraco.text.new.25356/python-jaraco.text.changes
2019-03-26 22:34:40.997673047 +0100
@@ -1,0 +2,7 @@
+Tue Mar 26 14:34:01 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 3.0:
+ * Remove collections dependency to avoid buildcycle
+- Remove multibuild as per above
+
+-------------------------------------------------------------------
Old:
----
_multibuild
jaraco.text-2.0.tar.gz
New:
----
jaraco.text-3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jaraco.text.spec ++++++
--- /var/tmp/diff_new_pack.iuCg2V/_old 2019-03-26 22:34:41.421672945 +0100
+++ /var/tmp/diff_new_pack.iuCg2V/_new 2019-03-26 22:34:41.425672944 +0100
@@ -17,16 +17,8 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -test
-%bcond_without test
-%else
-%define psuffix %{nil}
-%bcond_with test
-%endif
-Name: python-jaraco.text%{psuffix}
-Version: 2.0
+Name: python-jaraco.text
+Version: 3.0
Release: 0
Summary: Tools to work with text
License: MIT
@@ -34,6 +26,8 @@
URL: https://github.com/jaraco/jaraco.text
Source0:
https://files.pythonhosted.org/packages/source/j/jaraco.text/jaraco.text-%{version}.tar.gz
BuildRequires: %{python_module jaraco.base >= 6.1}
+BuildRequires: %{python_module jaraco.functools}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools_scm}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -43,11 +37,6 @@
Requires: python-jaraco.functools
Requires: python-six
BuildArch: noarch
-%if %{with test}
-BuildRequires: %{python_module jaraco.collections}
-BuildRequires: %{python_module jaraco.functools}
-BuildRequires: %{python_module pytest}
-%endif
%python_subpackages
%description
@@ -62,7 +51,6 @@
%python_build
%install
-%if !%{with test}
%python_install
%{python_expand rm -f %{buildroot}%{$python_sitelib}/jaraco/__init__.py* \
@@ -71,22 +59,15 @@
$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/jaraco/
%fdupes %{buildroot}%{$python_sitelib}
}
-%endif
%check
-%if %{with test}
-%{python_expand py.test-%{$python_bin_suffix} \
- --ignore=_build.python2 --ignore=_build.python3
-}
-%endif
+%pytest
-%if !%{with test}
%files %{python_files}
%license LICENSE
%doc docs/*.rst README.rst CHANGES.rst
%{python_sitelib}/jaraco.text-%{version}-py*.egg-info
%{python_sitelib}/jaraco/text.py*
%pycache_only %{python_sitelib}/jaraco/__pycache__/text*.py*
-%endif
%changelog
++++++ jaraco.text-2.0.tar.gz -> jaraco.text-3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/.flake8 new/jaraco.text-3.0/.flake8
--- old/jaraco.text-2.0/.flake8 2019-01-01 15:32:26.000000000 +0100
+++ new/jaraco.text-3.0/.flake8 2019-03-09 21:18:25.000000000 +0100
@@ -2,6 +2,8 @@
ignore =
# Allow tabs for indentation
W191
+ # Workaround for https://github.com/PyCQA/pycodestyle/issues/836
+ E117
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
W503
# W504 has issues
https://github.com/OCA/maintainer-quality-tools/issues/545
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/CHANGES.rst
new/jaraco.text-3.0/CHANGES.rst
--- old/jaraco.text-2.0/CHANGES.rst 2019-01-01 15:32:26.000000000 +0100
+++ new/jaraco.text-3.0/CHANGES.rst 2019-03-09 21:18:25.000000000 +0100
@@ -1,3 +1,16 @@
+3.0
+===
+
+Removed ``local_format``, ``global_format``, and
+``namespace_format``. Instead, developers should
+use `f-strings
+<https://docs.python.org/3.6/reference/lexical_analysis.html#f-strings>`_
+on Python 3.6 and later or `future-fstrings
+<https://pypi.org/project/future-fstrings>`_ for compatibilty
+with older Pythons. This change eliminates the dependency on
+jaraco.collections and thus for now removes the circular dependency
+as reported in #4.
+
2.0
===
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/PKG-INFO new/jaraco.text-3.0/PKG-INFO
--- old/jaraco.text-2.0/PKG-INFO 2019-01-01 15:32:45.000000000 +0100
+++ new/jaraco.text-3.0/PKG-INFO 2019-03-09 21:18:44.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: jaraco.text
-Version: 2.0
+Version: 3.0
Summary: Module for text manipulation
Home-page: https://github.com/jaraco/jaraco.text
Author: Jason R. Coombs
@@ -27,5 +27,5 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Requires-Python: >=2.7
-Provides-Extra: testing
Provides-Extra: docs
+Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/jaraco/text.py
new/jaraco.text-3.0/jaraco/text.py
--- old/jaraco.text-2.0/jaraco/text.py 2019-01-01 15:32:26.000000000 +0100
+++ new/jaraco.text-3.0/jaraco/text.py 2019-03-09 21:18:25.000000000 +0100
@@ -1,16 +1,13 @@
from __future__ import absolute_import, unicode_literals, print_function
-import sys
import re
-import inspect
import itertools
import textwrap
import functools
import six
-import jaraco.collections
-from jaraco.functools import compose
+from jaraco.functools import compose, method_cache
def substitution(old, new):
@@ -115,7 +112,7 @@
return self in FoldedCase(other)
# cache lower since it's likely to be called frequently.
- @jaraco.functools.method_cache
+ @method_cache
def lower(self):
return super(FoldedCase, self).lower()
@@ -127,52 +124,6 @@
return pattern.split(self, maxsplit)
-def local_format(string):
- """
- format the string using variables in the caller's local namespace.
-
- >>> a = 3
- >>> local_format("{a:5}")
- ' 3'
- """
- context = inspect.currentframe().f_back.f_locals
- if sys.version_info < (3, 2):
- return string.format(**context)
- return string.format_map(context)
-
-
-def global_format(string):
- """
- format the string using variables in the caller's global namespace.
-
- >>> a = 3
- >>> fmt = "The func name: {global_format.__name__}"
- >>> global_format(fmt)
- 'The func name: global_format'
- """
- context = inspect.currentframe().f_back.f_globals
- if sys.version_info < (3, 2):
- return string.format(**context)
- return string.format_map(context)
-
-
-def namespace_format(string):
- """
- Format the string using variable in the caller's scope (locals +
globals).
-
- >>> a = 3
- >>> fmt = "A is {a} and this func is {namespace_format.__name__}"
- >>> namespace_format(fmt)
- 'A is 3 and this func is namespace_format'
- """
- context = jaraco.collections.DictStack()
- context.push(inspect.currentframe().f_back.f_globals)
- context.push(inspect.currentframe().f_back.f_locals)
- if sys.version_info < (3, 2):
- return string.format(**context)
- return string.format_map(context)
-
-
def is_decodable(value):
r"""
Return True if the supplied value is decodable (using the default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/jaraco.text.egg-info/PKG-INFO
new/jaraco.text-3.0/jaraco.text.egg-info/PKG-INFO
--- old/jaraco.text-2.0/jaraco.text.egg-info/PKG-INFO 2019-01-01
15:32:45.000000000 +0100
+++ new/jaraco.text-3.0/jaraco.text.egg-info/PKG-INFO 2019-03-09
21:18:44.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: jaraco.text
-Version: 2.0
+Version: 3.0
Summary: Module for text manipulation
Home-page: https://github.com/jaraco/jaraco.text
Author: Jason R. Coombs
@@ -27,5 +27,5 @@
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Requires-Python: >=2.7
-Provides-Extra: testing
Provides-Extra: docs
+Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/jaraco.text.egg-info/requires.txt
new/jaraco.text-3.0/jaraco.text.egg-info/requires.txt
--- old/jaraco.text-2.0/jaraco.text.egg-info/requires.txt 2019-01-01
15:32:45.000000000 +0100
+++ new/jaraco.text-3.0/jaraco.text.egg-info/requires.txt 2019-03-09
21:18:44.000000000 +0100
@@ -1,5 +1,4 @@
jaraco.functools
-jaraco.collections
[docs]
sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/setup.cfg
new/jaraco.text-3.0/setup.cfg
--- old/jaraco.text-2.0/setup.cfg 2019-01-01 15:32:45.000000000 +0100
+++ new/jaraco.text-3.0/setup.cfg 2019-03-09 21:18:44.000000000 +0100
@@ -22,7 +22,6 @@
python_requires = >=2.7
install_requires =
jaraco.functools
- jaraco.collections
setup_requires = setuptools_scm >= 1.15.0
[options.extras_require]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaraco.text-2.0/skeleton.md
new/jaraco.text-3.0/skeleton.md
--- old/jaraco.text-2.0/skeleton.md 2019-01-01 15:32:26.000000000 +0100
+++ new/jaraco.text-3.0/skeleton.md 2019-03-09 21:18:25.000000000 +0100
@@ -10,6 +10,8 @@
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/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5)
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
