Remove setup_egg.py

2 files changed, 22 insertions, 70 deletions

diff --git a/setup.py b/setup.py
index 4254a534..3f70ea6e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,14 +5,18 @@ Setup script for networkx
 
 You can install networkx with
 
-python setup_egg.py install
+python setup.py install
 """
 from glob import glob
 import os
 import sys
-if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+if os.path.exists('MANIFEST'):
+    os.remove('MANIFEST')
 
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 if sys.argv[-1] == 'setup.py':
     print("To install, run 'python setup.py install'")
@@ -76,13 +80,13 @@ for d in ['advanced',
           'multigraph',
           'pygraphviz',
           'readwrite']:
-    dd=os.path.join(docdirbase,'examples',d)
-    pp=os.path.join('examples',d)
-    data.append((dd,glob(os.path.join(pp,"*.py"))))
-    data.append((dd,glob(os.path.join(pp,"*.bz2"))))
-    data.append((dd,glob(os.path.join(pp,"*.gz"))))
-    data.append((dd,glob(os.path.join(pp,"*.mbox"))))
-    data.append((dd,glob(os.path.join(pp,"*.edgelist"))))
+    dd = os.path.join(docdirbase,'examples', d)
+    pp = os.path.join('examples', d)
+    data.append((dd, glob(os.path.join(pp ,"*.py"))))
+    data.append((dd, glob(os.path.join(pp ,"*.bz2"))))
+    data.append((dd, glob(os.path.join(pp ,"*.gz"))))
+    data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
+    data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
 
 # add the tests
 package_data     = {
@@ -114,6 +118,8 @@ package_data     = {
     'networkx.utils': ['tests/*.py']
     }
 
+install_requires = ['setuptools']
+
 if __name__ == "__main__":
 
     setup(
@@ -133,6 +139,9 @@ if __name__ == "__main__":
         classifiers      = release.classifiers,
         packages         = packages,
         data_files       = data,
-        package_data     = package_data
-      )
-
+        package_data     = package_data,
+        install_requires = install_requires,
+        test_suite       = 'nose.collector',
+        tests_require    = ['nose>=0.10.1'],
+        zip_safe         = False
+    )
diff --git a/setup_egg.py b/setup_egg.py
deleted file mode 100755
index 924eacfe..00000000
--- a/setup_egg.py
+++ /dev/null
@@ -1,57 +0,0 @@
-
-#!/usr/bin/env python
-"""
-An alternate setup.py script that uses setuptools.
-
-You can install networkx with
-
-python setup_egg.py install
-
-If you have setuptools and run this as 
-
-python setup_egg.py bdist_egg
-
-you will get a Python egg.
-
-Use
-
-python setup_egg.py nosetests
-
-to run the tests.
-
-
-"""
-# local import, might need modification for 2.6/3.0
-from setup import *
-
-# must occur after local import to override distutils.core.setup
-from setuptools import setup
-
-
-if __name__ == "__main__":
-
-    setup(
-        name             = release.name.lower(),
-        version          = version,
-        maintainer       = release.maintainer,
-        maintainer_email = release.maintainer_email,
-        author           = release.authors['Hagberg'][0],
-        author_email     = release.authors['Hagberg'][1],
-        description      = release.description,
-        keywords         = release.keywords,
-        long_description = release.long_description,
-        license          = release.license,
-        platforms        = release.platforms,
-        url              = release.url,      
-        download_url     = release.download_url,
-        classifiers      = release.classifiers,
-        packages         = packages,
-        data_files       = data,
-        package_data     = package_data,
-        install_requires=['setuptools'],
-        test_suite       = 'nose.collector', 
-        tests_require    = ['nose >= 0.10.1'] ,
-        zip_safe = False
-      )
-
-