Permalink
Browse files

Revert "MAINT: remove setup*egg*.py -- always use setuptools, if pres…

…ent"

This reverts commit 3d06e4a.

Setuptools sets mode +x on the test scripts, so that Nose refuses to run
them. Better not do that.
  • Loading branch information...
pv committed Mar 28, 2013
1 parent dd40f08 commit a4e93fbd1c1e192b699e1ff545236dab7cffc579
Showing with 25 additions and 5 deletions.
  1. +4 −5 setup.py
  2. +7 −0 setupegg.py
  3. +7 −0 setupeggscons.py
  4. +7 −0 setupsconsegg.py
View
@@ -178,10 +178,6 @@ def configuration(parent_package='',top_path=None):
return config
def setup_package():
- try:
- import setuptools
- except ImportError:
- pass
# Rewrite the version file everytime
write_version_py()
@@ -213,7 +209,10 @@ def setup_package():
# They are required to succeed without Numpy for example when
# pip is used to install Scipy when Numpy is not yet present in
# the system.
- from distutils.core import setup
+ try:
+ from setuptools import setup
+ except ImportError:
+ from distutils.core import setup
FULLVERSION, GIT_REVISION = get_version_info()
metadata['version'] = FULLVERSION
View
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""
+A setup.py script to use setuptools, which gives egg goodness, etc.
+"""
+
+from setuptools import setup
+exec(compile(open('setup.py').read(), 'setup.py', 'exec'))
View
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""
+A setup.py script to use setuptools, which gives egg goodness, etc.
+"""
+
+from setuptools import setup
+exec(compile(open('setupscons.py').read(), 'setupscons.py', 'exec'))
View
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""
+A setup.py script to use setuptools, which gives egg goodness, etc.
+"""
+
+from setuptools import setup
+exec(compile(open('setupscons.py').read(), 'setupscons.py', 'exec'))

0 comments on commit a4e93fb

Please sign in to comment.