summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Holth <dholth@fastmail.fm>2014-03-26 23:03:58 -0400
committerDaniel Holth <dholth@fastmail.fm>2014-03-26 23:03:58 -0400
commita2e3d94e9f977ab4a9cd0ca502209e9e7861d215 (patch)
treec775929e4f96a7663d6285317e3e31623f622458
parent76c9802ab5c62aa52b6d7067ed08ea0659adb981 (diff)
downloadwheel-a2e3d94e9f977ab4a9cd0ca502209e9e7861d215.tar.gz
move experimental json metadata
-rw-r--r--wheel/bdist_wheel.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/wheel/bdist_wheel.py b/wheel/bdist_wheel.py
index c63f291..8401bd9 100644
--- a/wheel/bdist_wheel.py
+++ b/wheel/bdist_wheel.py
@@ -185,7 +185,7 @@ class bdist_wheel(Command):
install.warn_dir = False
if self.skip_scripts:
- # A wheel without setuptools scripts is more cross-platform.
+ # A wheel without setuptools scripts is more cross-platform.
install_scripts = self.reinitialize_command('install_scripts')
install_scripts.no_ep = True
@@ -289,19 +289,19 @@ class bdist_wheel(Command):
return metadata['license_file'][1]
def setupcfg_requirements(self):
- """Generate requirements from setup.cfg as
+ """Generate requirements from setup.cfg as
('Requires-Dist', 'requirement; qualifier') tuples. From a metadata
section in setup.cfg:
-
+
[metadata]
provides-extra = extra1
extra2
requires-dist = requirement; qualifier
another; qualifier2
unqualified
-
+
Yields
-
+
('Provides-Extra', 'extra1'),
('Provides-Extra', 'extra2'),
('Requires-Dist', 'requirement; qualifier'),
@@ -389,8 +389,8 @@ class bdist_wheel(Command):
metadata_path = os.path.join(distinfo_path, 'METADATA')
self.add_requirements(metadata_path)
- # XXX not a final specification
- metadata_json_path = os.path.join(distinfo_path, 'pydist.json')
+ # XXX intentionally a different path than the PEP.
+ metadata_json_path = os.path.join(distinfo_path, 'metadata.json')
pymeta = pkginfo_to_dict(metadata_path,
distribution=self.distribution)