fixing up standlone script, moving setuptools import to a safer place

toumorokoshi · Jun 27, 2016 · b2efe53 · b2efe53
1 parent a160c21
commit b2efe53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 ]
 
 setup(name='uranium',
-      version='0.2.43b',
+      version='0.2.44b',
       description='a build system for python',
       long_description=open('README.rst').read(),
       author='Yusuke Tsutsumi',

diff --git a/uranium/scripts/uranium_standalone b/uranium/scripts/uranium_standalone
@@ -19,7 +19,6 @@ import sys
 import tarfile
 import tempfile
 from optparse import (OptionParser, BadOptionError, AmbiguousOptionError)
-from pkg_resources import VersionConflict
 
 try:
     from urllib2 import urlopen as urlopen
@@ -141,7 +140,7 @@ def main(argv):
 def retrieve_system_uranium():
     """ if uranium already exists on the system path, use that instead. """
     try:
-        from pkg_resources import load_entry_point, DistributionNotFound
+        from pkg_resources import load_entry_point, DistributionNotFound, VersionConflict
         try:
             return load_entry_point("uranium", "console_scripts", "uranium")
         except (ImportError, DistributionNotFound, VersionConflict):