Hello community, here is the log from the commit of package python-wheel for openSUSE:Factory checked in at 2018-11-06 15:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wheel (Old) and /work/SRC/openSUSE:Factory/.python-wheel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wheel" Tue Nov 6 15:19:03 2018 rev:15 rq:645471 version:0.32.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wheel/python-wheel.changes 2018-10-18 15:29:03.234805347 +0200 +++ /work/SRC/openSUSE:Factory/.python-wheel.new/python-wheel.changes 2018-11-06 15:20:23.824959198 +0100 @@ -1,0 +2,9 @@ +Tue Oct 30 01:56:50 UTC 2018 - Arun Persaud <a...@gmx.de> + +- update to version 0.32.2: + * Fixed build number appearing in the ".dist-info" directory name + * Made wheel file name parsing more permissive + * Fixed wrong Python tag in wheels converted from eggs (PR by John + T. Wodder II) + +------------------------------------------------------------------- Old: ---- wheel-0.32.1.tar.gz New: ---- wheel-0.32.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wheel.spec ++++++ --- /var/tmp/diff_new_pack.kHmt6g/_old 2018-11-06 15:20:31.640947905 +0100 +++ /var/tmp/diff_new_pack.kHmt6g/_new 2018-11-06 15:20:31.640947905 +0100 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %{!?license: %global license %doc} Name: python-wheel -Version: 0.32.1 +Version: 0.32.2 Release: 0 Summary: A built-package format for Python License: MIT ++++++ wheel-0.32.1.tar.gz -> wheel-0.32.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/docs/conf.py new/wheel-0.32.2/docs/conf.py --- old/wheel-0.32.1/docs/conf.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/docs/conf.py 2018-10-20 22:03:14.000000000 +0200 @@ -10,8 +10,9 @@ # # All configuration values have a default; values that are commented out # serve to show the default. - -import pkg_resources +import io +import os +import re # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -47,10 +48,16 @@ # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = pkg_resources.working_set.by_key['wheel'].version -# The full version, including alpha/beta/rc tags. -release = version +here = os.path.abspath(os.path.dirname(__file__)) +with io.open(os.path.join(here, '..', 'wheel', '__init__.py'), + encoding='utf8') as version_file: + match = re.search(r'__version__ = "((\d+\.\d+\.\d+).*)"', + version_file.read()) + # The short X.Y version. + version = match.group(2) + + # The full version, including alpha/beta/rc tags. + release = match.group(1) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/docs/news.rst new/wheel-0.32.2/docs/news.rst --- old/wheel-0.32.1/docs/news.rst 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/docs/news.rst 2018-10-20 22:03:14.000000000 +0200 @@ -1,6 +1,13 @@ Release Notes ============= +**0.32.2** + +- Fixed build number appearing in the ``.dist-info`` directory name +- Made wheel file name parsing more permissive +- Fixed wrong Python tag in wheels converted from eggs + (PR by John T. Wodder II) + **0.32.1** - Fixed ``AttributeError: 'Requirement' object has no attribute 'url'`` on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/tests/cli/test_convert.py new/wheel-0.32.2/tests/cli/test_convert.py --- old/wheel-0.32.1/tests/cli/test_convert.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/tests/cli/test_convert.py 2018-10-20 22:03:14.000000000 +0200 @@ -1,6 +1,8 @@ import os.path +import re from wheel.cli.convert import convert, egg_info_re +from wheel.wheelfile import WHEEL_INFO_RE def test_egg_re(): @@ -15,4 +17,8 @@ def test_convert_egg(egg_paths, tmpdir): convert(egg_paths, str(tmpdir), verbose=False) - assert len(tmpdir.listdir()) == len(egg_paths) + wheel_names = [path.basename for path in tmpdir.listdir()] + assert len(wheel_names) == len(egg_paths) + assert all(WHEEL_INFO_RE.match(filename) for filename in wheel_names) + assert all(re.match('^[\w\d.]+-\d\.\d-\w+\d+-[\w\d]+-[\w\d]+\.whl$', fname) + for fname in wheel_names) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/tests/test_bdist_wheel.py new/wheel-0.32.2/tests/test_bdist_wheel.py --- old/wheel-0.32.1/tests/test_bdist_wheel.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/tests/test_bdist_wheel.py 2018-10-20 22:03:14.000000000 +0200 @@ -88,3 +88,13 @@ '--universal']) with WheelFile('dist/dummy_dist-1.0-py2.py3-none-any.whl') as wf: assert set(wf.namelist()) == DEFAULT_FILES + + +def test_build_number(dummy_dist, monkeypatch, tmpdir): + monkeypatch.chdir(dummy_dist) + subprocess.check_call([sys.executable, 'setup.py', 'bdist_wheel', '-b', str(tmpdir), + '--universal', '--build-number=2']) + with WheelFile('dist/dummy_dist-1.0-2-py2.py3-none-any.whl') as wf: + filenames = set(wf.namelist()) + assert 'dummy_dist-1.0.dist-info/RECORD' in filenames + assert 'dummy_dist-1.0.dist-info/METADATA' in filenames diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/wheel/__init__.py new/wheel-0.32.2/wheel/__init__.py --- old/wheel-0.32.1/wheel/__init__.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/wheel/__init__.py 2018-10-20 22:03:14.000000000 +0200 @@ -1,2 +1,2 @@ # __variables__ with double-quoted values will be available in setup.py: -__version__ = "0.32.1" +__version__ = "0.32.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/wheel/bdist_wheel.py new/wheel-0.32.2/wheel/bdist_wheel.py --- old/wheel-0.32.1/wheel/bdist_wheel.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/wheel/bdist_wheel.py 2018-10-20 22:03:14.000000000 +0200 @@ -233,7 +233,10 @@ self._ensure_relative(install.install_base)) self.set_undefined_options('install_egg_info', ('target', 'egginfo_dir')) - distinfo_dir = os.path.join(self.bdist_dir, '%s.dist-info' % self.wheel_dist_name) + distinfo_dirname = '{}-{}.dist-info'.format( + safer_name(self.distribution.get_name()), + safer_version(self.distribution.get_version())) + distinfo_dir = os.path.join(self.bdist_dir, distinfo_dirname) self.egg2dist(self.egginfo_dir, distinfo_dir) self.write_wheelfile(distinfo_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/wheel/cli/convert.py new/wheel-0.32.2/wheel/cli/convert.py --- old/wheel-0.32.1/wheel/cli/convert.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/wheel/cli/convert.py 2018-10-20 22:03:14.000000000 +0200 @@ -57,7 +57,7 @@ pyver = egg_info['pyver'] if pyver: - pyver = pyver.replace('.', '') + pyver = egg_info['pyver'] = pyver.replace('.', '') arch = (egg_info['arch'] or 'any').replace('.', '_').replace('-', '_') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wheel-0.32.1/wheel/wheelfile.py new/wheel-0.32.2/wheel/wheelfile.py --- old/wheel-0.32.1/wheel/wheelfile.py 2018-10-04 08:42:04.000000000 +0200 +++ new/wheel-0.32.2/wheel/wheelfile.py 2018-10-20 22:03:14.000000000 +0200 @@ -14,8 +14,8 @@ # Non-greedy matching of an optional build number may be too clever (more # invalid wheel filenames will match). Separate regex for .dist-info? WHEEL_INFO_RE = re.compile( - r"""^(?P<namever>(?P<name>.+?)-(?P<ver>\d.*?))(-(?P<build>\d.*?))? - -(?P<pyver>[a-z].+?)-(?P<abi>.+?)-(?P<plat>.+?)(\.whl|\.dist-info)$""", + r"""^(?P<namever>(?P<name>.+?)-(?P<ver>.+?))(-(?P<build>\d[^-]*))? + -(?P<pyver>.+?)-(?P<abi>.+?)-(?P<plat>.+?)\.whl$""", re.VERBOSE)