divmod-dev team mailing list archive
-
divmod-dev team
-
Mailing list archive
-
Message #00599
[Merge] lp:~exarkun/divmod.org/nevow-setup.py-simpler-code into lp:divmod.org
Jean-Paul Calderone has proposed merging lp:~exarkun/divmod.org/nevow-setup.py-simpler-code into lp:divmod.org with lp:~exarkun/divmod.org/nevow-setup.py-mandatory-setuptools as a prerequisite.
Commit message:
Simplify the code invoking `setuptools.setup` in Nevow's setup.py now that it does not depend on any conditions.
Requested reviews:
Divmod-dev (divmod-dev)
For more details, see:
https://code.launchpad.net/~exarkun/divmod.org/nevow-setup.py-simpler-code/+merge/222430
--
https://code.launchpad.net/~exarkun/divmod.org/nevow-setup.py-simpler-code/+merge/222430
Your team Divmod-dev is requested to review the proposed merge of lp:~exarkun/divmod.org/nevow-setup.py-simpler-code into lp:divmod.org.
=== modified file 'Nevow/setup.py'
--- Nevow/setup.py 2014-06-07 12:34:48 +0000
+++ Nevow/setup.py 2014-06-07 12:34:48 +0000
@@ -3,6 +3,7 @@
from nevow import __version__ as version
from setuptools import setup, find_packages
+from distutils.command.sdist import sdist
import os
data_files=[]
@@ -16,16 +17,19 @@
data_files.append((os.path.join('twisted', 'plugins'), [os.path.join('twisted', 'plugins', 'nevow_widget.py')]))
-setupdict = {
- 'name': 'Nevow',
- 'version': version,
- 'maintainer': 'Divmod, Inc.',
- 'maintainer_email': 'support@xxxxxxxxxx',
- 'description': 'Web Application Construction Kit',
- 'url': 'http://divmod.org/trac/wiki/DivmodNevow',
- 'license': 'MIT',
- 'platforms': ["any"],
- 'classifiers': [
+setup(
+ name='Nevow',
+ version=version,
+ packages=find_packages(),
+ include_package_data=True,
+ cmdclass={'sdist': sdist},
+ maintainer='Divmod, Inc.',
+ maintainer_email='support@xxxxxxxxxx',
+ description='Web Application Construction Kit',
+ url='http://divmod.org/trac/wiki/DivmodNevow',
+ license='MIT',
+ platforms=["any"],
+ classifiers=[
"Development Status :: 5 - Production/Stable",
"Framework :: Twisted",
"Intended Audience :: Developers",
@@ -34,9 +38,9 @@
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries",
],
- 'scripts': ['bin/nevow-xmlgettext', 'bin/nit'],
- 'data_files': data_files,
- 'package_data': {
+ scripts=['bin/nevow-xmlgettext', 'bin/nit'],
+ data_files=data_files,
+ package_data={
'formless': [
'freeform-default.css'
],
@@ -78,13 +82,4 @@
'*.js'
],
}
-}
-
-setupdict['packages'] = find_packages()
-setupdict['include_package_data'] = True
-
-from distutils.command.sdist import sdist
-setupdict['cmdclass'] = {'sdist': sdist}
-
-setup(**setupdict)
-
+)
Follow ups