diff options
| author | Alex Grönholm <alex.gronholm@nextday.fi> | 2020-01-21 18:51:02 +0200 |
|---|---|---|
| committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2020-01-21 18:51:02 +0200 |
| commit | 6c8effd79d2c71b768ac606c6b28579433ec62fd (patch) | |
| tree | bdc92b51f2d795fc954d8aa961e6465802e9cedc | |
| parent | 882650d0fd2fadd75f4ea7c5d6b62f15f81b398a (diff) | |
| download | wheel-git-6c8effd79d2c71b768ac606c6b28579433ec62fd.tar.gz | |
Fixed duplicate RECORD file when using "wheel pack" on Windows
| -rw-r--r-- | docs/news.rst | 1 | ||||
| -rw-r--r-- | tests/cli/test_pack.py | 1 | ||||
| -rw-r--r-- | wheel/wheelfile.py | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/docs/news.rst b/docs/news.rst index debb8d7..b690329 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -7,6 +7,7 @@ Release Notes (PR by Grzegorz Bokota) - Updated project packaging and testing configuration for :pep:`517` - Moved the contents of setup.py to setup.cfg +- Fixed duplicate RECORD file when using "wheel pack" on Windows **0.33.6 (2019-08-18)** diff --git a/tests/cli/test_pack.py b/tests/cli/test_pack.py index b90687e..818f817 100644 --- a/tests/cli/test_pack.py +++ b/tests/cli/test_pack.py @@ -10,6 +10,7 @@ TESTWHEEL_NAME = 'test-1.0-py2.py3-none-any.whl' TESTWHEEL_PATH = os.path.join(THISDIR, '..', 'testdata', TESTWHEEL_NAME) +@pytest.mark.filterwarnings('error:Duplicate name') @pytest.mark.parametrize('build_number, filename', [ (None, 'test-1.0-py2.py3-none-any.whl'), ('2b', 'test-1.0-2b-py2.py3-none-any.whl') diff --git a/wheel/wheelfile.py b/wheel/wheelfile.py index ddf8509..fa00258 100644 --- a/wheel/wheelfile.py +++ b/wheel/wheelfile.py @@ -115,7 +115,7 @@ class WheelFile(ZipFile): for name in sorted(filenames): path = os.path.normpath(os.path.join(root, name)) if os.path.isfile(path): - arcname = os.path.relpath(path, base_dir) + arcname = os.path.relpath(path, base_dir).replace(os.path.sep, '/') if arcname == self.record_path: pass elif root.endswith('.dist-info'): |