[Python-checkins] distutils2: merged Nicolas work
tarek.ziade
python-checkins at python.org
Wed Mar 17 02:58:36 CET 2010
tarek.ziade pushed b9f6ff62c66e to distutils2:
http://hg.python.org/distutils2/rev/b9f6ff62c66e
changeset: 79:b9f6ff62c66e
tag: tip
parent: 75:932d3aefeae4
parent: 78:07c81cdef27f
user: Tarek Ziade <tarek at ziade.org>
date: Tue Mar 16 21:58:14 2010 -0400
summary: merged Nicolas work
files:
diff --git a/src/distutils2/command/register.py b/src/distutils2/command/register.py
--- a/src/distutils2/command/register.py
+++ b/src/distutils2/command/register.py
@@ -239,7 +239,7 @@
'description': meta['Description'],
'keywords': meta['Keywords'],
'platform': meta['Platform'],
- 'classifiers': meta['Classifier'],
+ 'classifier': meta['Classifier'],
'download_url': meta['Download-URL'],
#'provides': meta['Provides'],
#'requires': meta['Requires'],
diff --git a/src/distutils2/core.py b/src/distutils2/core.py
--- a/src/distutils2/core.py
+++ b/src/distutils2/core.py
@@ -1,9 +1,9 @@
-"""distutils.core
+"""distutils2.core
The only module that needs to be imported to use the Distutils; provides
the 'setup' function (which is to be called from the setup script). Also
indirectly provides the Distribution and Command classes, although they are
-really defined in distutils.dist and distutils.cmd.
+really defined in distutils2.dist and distutils2.cmd.
"""
__revision__ = "$Id: core.py 77704 2010年01月23日 09:23:15Z tarek.ziade $"
@@ -15,7 +15,7 @@
DistutilsError, CCompilerError)
from distutils2.util import grok_environment_error
-# Mainly import these so setup scripts can "from distutils.core import" them.
+# Mainly import these so setup scripts can "from distutils2.core import" them.
from distutils2.dist import Distribution
from distutils2.cmd import Command
from distutils2.config import PyPIRCCommand
@@ -76,9 +76,9 @@
will be turned into a command class, which is in turn instantiated; any
class found in 'cmdclass' is used in place of the default, which is
(for command 'foo_bar') class 'foo_bar' in module
- 'distutils.command.foo_bar'. The command class must provide a
+ 'distutils2.command.foo_bar'. The command class must provide a
'user_options' attribute which is a list of option specifiers for
- 'distutils.fancy_getopt'. Any command-line options between the current
+ 'distutils2.fancy_getopt'. Any command-line options between the current
and the next command are used to set attributes of the current command
object.
@@ -212,7 +212,7 @@
if _setup_distribution is None:
raise RuntimeError, \
- ("'distutils.core.setup()' was never called -- "
+ ("'distutils2.core.setup()' was never called -- "
"perhaps '%s' is not a Distutils setup script?") % \
script_name
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -101,7 +101,7 @@
"print the long package description"),
('platforms', None,
"print the list of platforms"),
- ('classifiers', None,
+ ('classifier', None,
"print the list of classifiers"),
('keywords', None,
"print the list of keywords"),
@@ -672,7 +672,7 @@
value = self.metadata[opt]
if opt in ['keywords', 'platform']:
print(','.join(value))
- elif opt in ('classifiers', 'provides', 'requires',
+ elif opt in ('classifier', 'provides', 'requires',
'obsoletes'):
print('\n'.join(value))
else:
diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -73,8 +73,8 @@
'Keywords', 'Home-page', 'Author', 'Author-email',
'Maintainer', 'Maintainer-email', 'License',
'Classifier', 'Download-URL', 'Obsoletes-Dist',
- 'Provides-Dist', 'Requires-Dist', 'Requires-Python',
- 'Requires-External')
+ 'Project-URL', 'Provides-Dist', 'Requires-Dist',
+ 'Requires-Python', 'Requires-External')
_345_MARKERS = ('Provides-Dist', 'Requires-Dist', 'Requires-Python',
'Obsoletes-Dist', 'Requires-External', 'Maintainer',
@@ -124,10 +124,10 @@
'version': 'Version',
'platform': 'Platform',
'supported_platform': 'Supported-Platform',
- 'description': 'Summary',
- 'long_description': 'Description',
+ 'summary': 'Summary',
+ 'description': 'Description',
'keywords': 'Keywords',
- 'url': 'Home-page',
+ 'home_page': 'Home-page',
'author': 'Author',
'author_email': 'Author-email',
'maintainer': 'Maintainer',
@@ -143,6 +143,7 @@
'requires': 'Requires',
'provides': 'Provides',
'obsoletes': 'Obsoletes',
+ 'project_url': 'Project-URL',
}
_PREDICATE_FIELDS = ('Requires-Dist', 'Obsoletes-Dist', 'Provides-Dist')
diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py
--- a/src/distutils2/mkpkg.py
+++ b/src/distutils2/mkpkg.py
@@ -678,7 +678,7 @@
self.config = None
self.classifierDict = {}
self.setupData = {}
- self.setupData['classifiers'] = self.classifierDict
+ self.setupData['classifier'] = self.classifierDict
self.setupData['packages'] = {}
self.loadConfigFile()
@@ -873,12 +873,12 @@
fp = open('setup.py', 'w')
fp.write('#!/usr/bin/env python\n\n')
- fp.write('from distutils.core import setup\n\n')
+ fp.write('from distutils2.core import setup\n\n')
fp.write('from sys import version\n')
fp.write('if version < \'2.2.3\':\n')
- fp.write(' from distutils.dist import DistributionMetadata\n')
- fp.write(' DistributionMetadata.classifiers = None\n')
+ fp.write(' from distutils2.dist import DistributionMetadata\n')
+ fp.write(' DistributionMetadata.classifier = None\n')
fp.write(' DistributionMetadata.download_url = None\n')
fp.write('setup(name = %s,\n' % repr(self.setupData['name']))
@@ -890,9 +890,9 @@
% repr(self.setupData['author_email']))
if self.setupData['url']:
fp.write(' url = %s,\n' % repr(self.setupData['url']))
- if self.setupData['classifiers']:
- fp.write(' classifiers = [\n')
- for classifier in sorted(self.setupData['classifiers'].keys()):
+ if self.setupData['classifier']:
+ fp.write(' classifier = [\n')
+ for classifier in sorted(self.setupData['classifier'].keys()):
fp.write(' %s,\n' % repr(classifier))
fp.write(' ],\n')
if self.setupData['packages']:
diff --git a/src/distutils2/tests/test_check.py b/src/distutils2/tests/test_check.py
--- a/src/distutils2/tests/test_check.py
+++ b/src/distutils2/tests/test_check.py
@@ -32,7 +32,7 @@
# now let's add the required fields
# and run it again, to make sure we don't get
# any warning anymore
- metadata = {'url': 'xxx', 'author': 'xxx',
+ metadata = {'home_page': 'xxx', 'author': 'xxx',
'author_email': 'xxx',
'name': 'xxx', 'version': 'xxx'
}
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -134,8 +134,8 @@
dist = klass(attrs={'author': u'Mister Café',
'name': 'my.package',
'maintainer': u'Café Junior',
- 'description': u'Café torréfié',
- 'long_description': u'Héhéhé'})
+ 'summary': u'Café torréfié',
+ 'description': u'Héhéhé'})
# let's make sure the file can be written
@@ -147,8 +147,8 @@
dist = klass(attrs={'author': 'Mister Cafe',
'name': 'my.package',
'maintainer': 'Cafe Junior',
- 'description': 'Cafe torrefie',
- 'long_description': 'Hehehe'})
+ 'summary': 'Cafe torrefie',
+ 'description': 'Hehehe'})
my_file2 = os.path.join(tmp_dir, 'f2')
dist.metadata.write_file(open(my_file, 'w'))
@@ -379,26 +379,26 @@
if line.strip() != '']
self.assertTrue(len(output) > 0)
- def test_long_description(self):
- long_desc = textwrap.dedent("""\
+ def test_description(self):
+ desc = textwrap.dedent("""\
example::
We start here
and continue here
and end here.""")
attrs = {"name": "package",
"version": "1.0",
- "long_description": long_desc}
+ "description": desc}
dist = distutils2.dist.Distribution(attrs)
meta = self.format_metadata(dist)
meta = meta.replace('\n' + 7 * ' ' + '|', '\n')
- self.assertTrue(long_desc in meta)
+ self.assertTrue(desc in meta)
def test_read_metadata(self):
attrs = {"name": "package",
"version": "1.0",
- "long_description": "desc",
- "description": "xxx",
+ "description": "desc",
+ "summary": "xxx",
"download_url": "http://example.com",
"keywords": ['one', 'two'],
"requires_dist": ['foo']}
@@ -414,7 +414,7 @@
metadata.read_file(PKG_INFO)
self.assertEquals(metadata['name'], "package")
self.assertEquals(metadata['version'], "1.0")
- self.assertEquals(metadata['description'], "xxx")
+ self.assertEquals(metadata['summary'], "xxx")
self.assertEquals(metadata['download_url'], 'http://example.com')
self.assertEquals(metadata['keywords'], ['one', 'two'])
self.assertEquals(metadata['platform'], [])
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list