File tree Expand file tree Collapse file tree 4 files changed +19
-6
lines changed Expand file tree Collapse file tree 4 files changed +19
-6
lines changed Original file line number Diff line number Diff line change 1
1
Release Notes
2
2
=============
3
3
4
+ **0.38.2 (2022-11-05) **
5
+
6
+ - Fixed regression introduced in v0.38.1 which broke parsing of wheel file names with
7
+ multiple platform tags
8
+
4
9
**0.38.1 (2022-11-04) **
5
10
6
11
- Removed install dependency on setuptools
Original file line number Diff line number Diff line change 1
1
from __future__ import annotations
2
2
3
- __version__ = "0.38.1 "
3
+ __version__ = "0.38.2 "
Original file line number Diff line number Diff line change 16
16
# Non-greedy matching of an optional build number may be too clever (more
17
17
# invalid wheel filenames will match). Separate regex for .dist-info?
18
18
WHEEL_INFO_RE = re .compile (
19
- r"""^(?P<namever>(?P<name>[^-]+?)-(?P<ver>[^-]+?))(-(?P<build>\d[^-]*))?
20
- -(?P<pyver>[^-]+?)-(?P<abi>[^-]+?)-(?P<plat>[^.]+? )\.whl$""" ,
19
+ r"""^(?P<namever>(?P<name>[^\s -]+?)-(?P<ver>[^\s -]+?))(-(?P<build>\d[^\s -]*))?
20
+ -(?P<pyver>[^\s -]+?)-(?P<abi>[^\s -]+?)-(?P<plat>\S+ )\.whl$""" ,
21
21
re .VERBOSE ,
22
22
)
23
23
MINIMUM_TIMESTAMP = 315532800 # 1980-01-01 00:00:00 UTC
Original file line number Diff line number Diff line change @@ -14,9 +14,16 @@ def wheel_path(tmpdir):
14
14
return str (tmpdir .join ("test-1.0-py2.py3-none-any.whl" ))
15
15
16
16
17
- def test_wheelfile_re (tmpdir ):
18
- # Regression test for #208
19
- path = tmpdir .join ("foo-2-py3-none-any.whl" )
17
+ @pytest .mark .parametrize (
18
+ "filename" ,
19
+ [
20
+ "foo-2-py3-none-any.whl" ,
21
+ "foo-2-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" ,
22
+ ],
23
+ )
24
+ def test_wheelfile_re (filename , tmpdir ):
25
+ # Regression test for #208 and #485
26
+ path = tmpdir .join (filename )
20
27
with WheelFile (str (path ), "w" ) as wf :
21
28
assert wf .parsed_filename .group ("namever" ) == "foo-2"
22
29
@@ -29,6 +36,7 @@ def test_wheelfile_re(tmpdir):
29
36
"test-1.0-py2.whl" ,
30
37
"test-1.0-py2-none.whl" ,
31
38
"test-1.0-py2-none-any" ,
39
+ "test-1.0-py 2-none-any.whl" ,
32
40
],
33
41
)
34
42
def test_bad_wheel_filename (filename ):
You can’t perform that action at this time.
0 commit comments