Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix upload metadata #1576

Merged
merged 19 commits into from
Nov 12, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Store metadata version on metadata object
pganssle committed Nov 7, 2018
commit e5d362d3736bc5972835a55bcb165d8c55913547
8 changes: 6 additions & 2 deletions setuptools/dist.py
Original file line number Diff line number Diff line change
@@ -10,7 +10,11 @@
import distutils.cmd
import distutils.dist
import itertools


from collections import defaultdict
from email import message_from_file

from distutils.errors import (
DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
)
@@ -69,7 +73,7 @@ def _read_list(name):
return None
return values

metadata_version = msg['metadata-version']
self.metadata_version = StrictVersion(msg['metadata-version'])
self.name = _read_field('name')
self.version = _read_field('version')
self.description = _read_field('summary')
@@ -96,7 +100,7 @@ def _read_list(name):
self.classifiers = _read_list('classifier')

# PEP 314 - these fields only exist in 1.1
if metadata_version == '1.1':
if metadata_version == StrictVersion('1.1'):
self.requires = _read_list('requires')
self.provides = _read_list('provides')
self.obsoletes = _read_list('obsoletes')