Merge lp:~wes-turner/pydoctor/setuptools into lp:~mwhudson/pydoctor/dev

[Wes Turner]

Switches from bare distutils to setuptools for install_requires and console_script entry_points to add support for things like "pip install -e bzr+lp:pydoctor" (Test: "python setup.py develop").

Not sure what the packaging requirements are. Just added this while installing this evening and thought I'd share.

Unmerged revisions

566. By wturner <wturner@wrk> on 2010-09-12

Migrating setup.py to setuptools. Adding install_requires, a console_script entry_point, and (presumably?) updating the project URL.

=== removed directory 'bin'
=== removed file 'bin/pydoctor'
--- bin/pydoctor	2010-02-06 03:30:38 +0000
+++ bin/pydoctor	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-d = os.path.dirname(os.path.dirname(__file__))
-
-if os.path.isdir(os.path.join(d, 'pydoctor')):
-   sys.path.insert(0, d)
-
-from pydoctor.driver import main
-
-sys.exit(main(sys.argv[1:]))

=== modified file 'pydoctor/driver.py'
--- pydoctor/driver.py	2010-03-11 03:18:45 +0000
+++ pydoctor/driver.py	2010-09-12 07:01:00 +0000
@@ -223,6 +223,10 @@
     options.verbosity -= options.quietness
     return options, args
 
+def console_main():
+    import sys
+    main(sys.argv[1:])
+
 def main(args):
     import cPickle
     options, args = parse_args(args)

=== modified file 'setup.py'
--- setup.py	2010-03-28 22:55:26 +0000
+++ setup.py	2010-09-12 07:01:00 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/python
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name='pydoctor',
     version='0.3',
     author='Michael Hudson',
     author_email='[e-mail]',
-    url='http://codespeak.net/svn/user/mwh/pydoctor/trunk',
+    url='https://code.launchpad.net/~mwhudson/pydoctor/dev',
     description='API doc generator.',
     license='MIT/X11',
     packages=[
@@ -19,7 +19,13 @@
             'templates/*',
             ],
         },
-    scripts=[
-        'bin/pydoctor',
+    install_requires=[
+        'twisted',
+        'nevow',
         ],
+    entry_points={
+        'console_scripts': [
+            'pydoctor = pydoctor.driver:console_main',
+            ]
+        }
     )