Hello community,
here is the log from the commit of package python-py2pack for
openSUSE:Leap:15.2 checked in at 2020-03-09 18:10:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-py2pack (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-py2pack.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-py2pack"
Mon Mar 9 18:10:51 2020 rev:27 rq:776946 version:0.8.4
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-py2pack/python-py2pack.changes
2020-01-15 15:51:44.479539369 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-py2pack.new.26092/python-py2pack.changes
2020-03-09 18:10:52.337154136 +0100
@@ -1,0 +2,23 @@
+Tue Mar 26 15:43:09 UTC 2019 - John Vandenberg <[email protected]>
+
+- Fix fdupes
+- Install only Python 3 Sphinx for docs
+
+-------------------------------------------------------------------
+Thu Dec 6 21:03:16 UTC 2018 - Jan Engelhardt <[email protected]>
+
+- Use noun phrase in summary.
+
+-------------------------------------------------------------------
+Thu Dec 6 19:58:15 UTC 2018 - Thomas Bechtold <[email protected]>
+
+- update to 0.8.4:
+ * Ignore some more pep8 warnings
+ * Support %license macro
+
+-------------------------------------------------------------------
+Tue Dec 4 12:53:25 UTC 2018 - Matej Cepl <[email protected]>
+
+- Remove superfluous devel dependency for noarch package
+
+-------------------------------------------------------------------
Old:
----
py2pack-0.8.3.tar.gz
New:
----
py2pack-0.8.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-py2pack.spec ++++++
--- /var/tmp/diff_new_pack.JSseJr/_old 2020-03-09 18:10:52.573154475 +0100
+++ /var/tmp/diff_new_pack.JSseJr/_new 2020-03-09 18:10:52.577154480 +0100
@@ -12,28 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-py2pack
-Version: 0.8.3
+Version: 0.8.4
Release: 0
-Url: https://github.com/openSUSE/py2pack
-Summary: Generate distribution packages from Python packages on PyPI
+Summary: Script for generating distribution packages from Python
packages on PyPI
License: Apache-2.0
Group: Development/Languages/Python
+URL: https://github.com/openSUSE/py2pack
Source:
https://files.pythonhosted.org/packages/source/p/py2pack/py2pack-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{python_module Jinja2}
-BuildRequires: %{python_module Sphinx}
-BuildRequires: %{python_module devel}
BuildRequires: %{python_module metaextract}
BuildRequires: %{python_module pbr}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
-BuildRequires: %{python_module sphinxcontrib-programoutput}
+# SECTION doc requirements
+BuildRequires: python3-Sphinx
+BuildRequires: python3-sphinxcontrib-programoutput
+# /SECTION
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Jinja2
@@ -72,6 +72,7 @@
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/py2pack
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
%post
%python_install_alternative py2pack
@@ -80,14 +81,13 @@
%python_uninstall_alternative py2pack
%files %{python_files}
-%defattr(-,root,root,-)
%python_alternative %{_bindir}/py2pack
%{python_sitelib}/py2pack-%{version}-py*.egg-info
%{python_sitelib}/py2pack/
%files -n %{name}-doc
-%defattr(-,root,root,-)
-%doc AUTHORS LICENSE
+%license LICENSE
+%doc AUTHORS
%doc doc/build/html/
%changelog
++++++ py2pack-0.8.3.tar.gz -> py2pack-0.8.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/AUTHORS new/py2pack-0.8.4/AUTHORS
--- old/py2pack-0.8.3/AUTHORS 2018-04-21 07:08:34.000000000 +0200
+++ new/py2pack-0.8.4/AUTHORS 2018-12-06 20:56:38.000000000 +0100
@@ -9,4 +9,3 @@
Sascha Peilicke <[email protected]>
Sebastian Wagner <[email protected]>
Thomas Bechtold <[email protected]>
-frispete <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/ChangeLog new/py2pack-0.8.4/ChangeLog
--- old/py2pack-0.8.3/ChangeLog 2018-04-21 07:08:34.000000000 +0200
+++ new/py2pack-0.8.4/ChangeLog 2018-12-06 20:56:38.000000000 +0100
@@ -1,6 +1,12 @@
CHANGES
=======
+0.8.4
+-----
+
+* Ignore some more pep8 warnings
+* Support %license macro
+
0.8.3
-----
@@ -146,7 +152,6 @@
* tox: Add possibility to run single test cases
* Ignore .eggs/ dir in git
* Update the SPDX mapping file
-* travis: Use matrix to execute tox envs
* Remove python 2.6 support
* travis: remove --use-mirrors pip flag usage
* tests: ignore console\_scripts order during tests
@@ -163,7 +168,4 @@
* Remove unused 'requires' from opensuse template
* Quote %doc filenames if they contain shell metacharacters
* Add support for "entry\_points" and "console\_scripts" parameters
-* Support syntactic variations as per the setuptools spec
* Adjust Travis CI build
-* Remove commented code and make pep8 happy
-* Don't include comma in \_parse\_setup\_py regexp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/PKG-INFO new/py2pack-0.8.4/PKG-INFO
--- old/py2pack-0.8.3/PKG-INFO 2018-04-21 07:08:34.000000000 +0200
+++ new/py2pack-0.8.4/PKG-INFO 2018-12-06 20:56:38.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py2pack
-Version: 0.8.3
+Version: 0.8.4
Summary: Generate distribution packages from PyPI
Home-page: http://github.com/openSUSE/py2pack
Author: Sascha Peilicke, Thomas Bechtold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/py2pack/__init__.py
new/py2pack-0.8.4/py2pack/__init__.py
--- old/py2pack-0.8.3/py2pack/__init__.py 2018-04-21 07:07:49.000000000
+0200
+++ new/py2pack-0.8.4/py2pack/__init__.py 2018-12-06 20:56:05.000000000
+0100
@@ -141,9 +141,16 @@
data["console_scripts"] =
data["entry_points"]["console_scripts"].keys()
-def _augment_data_from_tarball(args, filename, data):
- docs_re =
re.compile("{0}-{1}\/((?:AUTHOR|ChangeLog|CHANGES|COPYING|LICENSE|NEWS|README).*)".format(args.name,
args.version), re.IGNORECASE)
+def _quote_shell_metacharacters(string):
shell_metachars_re = re.compile("[|&;()<>\s]")
+ if re.search(shell_metachars_re, string):
+ return "'" + string + "'"
+ return string
+
+
+def _augment_data_from_tarball(args, filename, data):
+ docs_re =
re.compile("{0}-{1}\/((?:AUTHOR|ChangeLog|CHANGES|NEWS|README).*)".format(args.name,
args.version), re.IGNORECASE)
+ license_re =
re.compile("{0}-{1}\/((?:COPYING|LICENSE).*)".format(args.name, args.version),
re.IGNORECASE)
data_archive = meta_utils.from_archive(filename)
data.update(data_archive['data'])
@@ -152,14 +159,16 @@
_canonicalize_setup_data(data)
for name in names:
- match = re.match(docs_re, name)
- if match:
+ match_docs = re.match(docs_re, name)
+ match_license = re.match(license_re, name)
+ if match_docs:
if "doc_files" not in data:
data["doc_files"] = []
- if re.search(shell_metachars_re, match.group(1)): #
quote filename if it contains shell metacharacters
- data["doc_files"].append("'" + match.group(1) + "'")
- else:
- data["doc_files"].append(match.group(1))
+
data["doc_files"].append(_quote_shell_metacharacters(match_docs.group(1)))
+ if match_license:
+ if "license_files" not in data:
+ data["license_files"] = []
+
data["license_files"].append(_quote_shell_metacharacters(match_license.group(1)))
# Very broad check for testsuites
if "test" in name.lower():
data["testsuite"] = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/py2pack/templates/opensuse-legacy.spec
new/py2pack-0.8.4/py2pack/templates/opensuse-legacy.spec
--- old/py2pack-0.8.3/py2pack/templates/opensuse-legacy.spec 2018-04-21
07:07:49.000000000 +0200
+++ new/py2pack-0.8.4/py2pack/templates/opensuse-legacy.spec 2018-12-06
20:56:05.000000000 +0100
@@ -78,6 +78,9 @@
{%- if doc_files and doc_files is not none %}
%doc {{ doc_files|join(" ") }}
{%- endif %}
+{%- if license_files and license_files is not none %}
+%license {{ license_files|join(" ") }}
+{%- endif %}
{%- if scripts and scripts is not none %}
{%- for script in scripts %}
%{_bindir}/{{ script|basename }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/py2pack/templates/opensuse.spec
new/py2pack-0.8.4/py2pack/templates/opensuse.spec
--- old/py2pack-0.8.3/py2pack/templates/opensuse.spec 2018-04-21
07:07:49.000000000 +0200
+++ new/py2pack-0.8.4/py2pack/templates/opensuse.spec 2018-12-06
20:56:05.000000000 +0100
@@ -95,6 +95,9 @@
{%- if doc_files and doc_files is not none %}
%doc {{ doc_files|join(" ") }}
{%- endif %}
+{%- if license_files and license_files is not none %}
+%license {{ license_files|join(" ") }}
+{%- endif %}
{%- if scripts and scripts is not none %}
{%- for script in scripts %}
%python3_only %{_bindir}/{{ script|basename }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/py2pack.egg-info/PKG-INFO
new/py2pack-0.8.4/py2pack.egg-info/PKG-INFO
--- old/py2pack-0.8.3/py2pack.egg-info/PKG-INFO 2018-04-21 07:08:34.000000000
+0200
+++ new/py2pack-0.8.4/py2pack.egg-info/PKG-INFO 2018-12-06 20:56:38.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py2pack
-Version: 0.8.3
+Version: 0.8.4
Summary: Generate distribution packages from PyPI
Home-page: http://github.com/openSUSE/py2pack
Author: Sascha Peilicke, Thomas Bechtold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/py2pack.egg-info/pbr.json
new/py2pack-0.8.4/py2pack.egg-info/pbr.json
--- old/py2pack-0.8.3/py2pack.egg-info/pbr.json 2018-04-21 07:08:34.000000000
+0200
+++ new/py2pack-0.8.4/py2pack.egg-info/pbr.json 2018-12-06 20:56:38.000000000
+0100
@@ -1 +1 @@
-{"git_version": "07ae3ac", "is_release": true}
\ No newline at end of file
+{"git_version": "433bd8b", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/test/test_py2pack.py
new/py2pack-0.8.4/test/test_py2pack.py
--- old/py2pack-0.8.3/test/test_py2pack.py 2018-04-21 07:07:49.000000000
+0200
+++ new/py2pack-0.8.4/test/test_py2pack.py 2018-12-06 20:56:05.000000000
+0100
@@ -88,6 +88,10 @@
d = {'classifiers': value}
self.assertEqual(py2pack._license_from_classifiers(d), expected)
+ def test__quote_shell_metacharacters(self):
+ self.assertEqual(py2pack._quote_shell_metacharacters("abc"), "abc")
+ self.assertEqual(py2pack._quote_shell_metacharacters("abc&"), "'abc&'")
+
def test__prepare_template_env(self):
template_dir = os.path.join(os.path.dirname(
os.path.abspath(__file__)), '..', 'py2pack', 'templates')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/py2pack-0.8.3/tox.ini new/py2pack-0.8.4/tox.ini
--- old/py2pack-0.8.3/tox.ini 2018-04-21 07:07:49.000000000 +0200
+++ new/py2pack-0.8.4/tox.ini 2018-12-06 20:56:05.000000000 +0100
@@ -22,6 +22,6 @@
commands = flake8
[flake8]
-ignore = E501,E402
+ignore = E501,E402,W605,W504
show-source = True
exclude = .venv,.tox,build,dist,doc,*egg
