[yt-svn] commit/yt: xarthisius: Don't try to import distribute if setuptools>=0.7 is detected

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/76b555d4075c/
Changeset:   76b555d4075c
Branch:      yt
User:        xarthisius
Date:        2013-07-04 08:35:20
Summary:     Don't try to import distribute if setuptools>=0.7 is detected
Affected #:  1 file

diff -r 1b51d03f4df7744e1bf44c0d429dd876785164a0 -r 76b555d4075c708d15d5e157921dcd4fc80f364c setup.py
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,11 @@
 import subprocess
 import shutil
 import glob
-import distribute_setup
-distribute_setup.use_setuptools()
+import setuptools
+from distutils.version import StrictVersion
+if StrictVersion(setuptools.__version__) < StrictVersion('0.7.0'):
+    import distribute_setup
+    distribute_setup.use_setuptools()
 
 from distutils.command.build_py import build_py
 from numpy.distutils.misc_util import appendpath
@@ -153,8 +156,6 @@
 # End snippet
 ######
 
-import setuptools
-
 VERSION = "2.6dev"
 
 if os.path.exists('MANIFEST'):

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.