diff options
author | Paul Ganssle <paul@ganssle.io> | 2018-11-05 10:26:50 -0500 |
---|---|---|
committer | Paul Ganssle <paul@ganssle.io> | 2018-11-07 17:38:41 -0500 |
commit | 33185837dbc1f75f7894b9cbc3e56c1c6a868c4c (patch) | |
tree | e9223e2498b70d21b345b3019132df89adbc4dc3 | |
parent | 386fcdbe02c4170a560d67742f2ac1319430ff43 (diff) | |
download | external_python_setuptools-33185837dbc1f75f7894b9cbc3e56c1c6a868c4c.tar.gz external_python_setuptools-33185837dbc1f75f7894b9cbc3e56c1c6a868c4c.tar.bz2 external_python_setuptools-33185837dbc1f75f7894b9cbc3e56c1c6a868c4c.zip |
Use get_metadata_version in upload_file
Previously this value was hard-coded to '1.0', which was inaccurate for
many packages.
Fixes #1381
-rw-r--r-- | setuptools/command/upload.py | 2 | ||||
-rw-r--r-- | setuptools/tests/test_upload.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index dae7d74d..01fa026c 100644 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -84,7 +84,7 @@ class upload(orig.upload): 'md5_digest': hashlib.md5(content).hexdigest(), # additional meta-data - 'metadata_version': '1.0', + 'metadata_version': str(meta.get_metadata_version()), 'summary': meta.get_description(), 'home_page': meta.get_url(), 'author': meta.get_contact(), diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py index 5b8e267c..b18f83c8 100644 --- a/setuptools/tests/test_upload.py +++ b/setuptools/tests/test_upload.py @@ -33,7 +33,6 @@ def _parse_upload_body(body): class TestUploadTest: - @pytest.mark.xfail(reason='Issue #1381') @mock.patch('setuptools.command.upload.urlopen') def test_upload_metadata(self, patch, tmpdir): dist = Distribution() |