Permalink
Browse files

BLD: fix build for py3k + pip. Closes #1857. Thanks to Erik Bray.

Also works inside a virtualenv.
  • Loading branch information...
1 parent 57b56bc commit dba98cc143687bcb9ab25403b5d51fdefd582370 @rgommers rgommers committed with charris Aug 2, 2011
Showing with 18 additions and 1 deletion.
  1. +5 −1 numpy/distutils/ccompiler.py
  2. +13 −0 setup.py
@@ -58,7 +58,11 @@ def CCompiler_spawn(self, cmd, display=None):
if s:
if is_sequence(cmd):
cmd = ' '.join(list(cmd))
- print(o)
+ try:
+ print(o)
+ except UnicodeError:
+ # When installing through pip, `o` can contain non-ascii chars
+ pass
if re.search('Too many open files', o):
msg = '\nTry rerunning setup command until build succeeds.'
else:
View
@@ -167,6 +167,19 @@ def setup_package():
if os.path.isfile(site_cfg):
shutil.copy(site_cfg, src_path)
+ # Ugly hack to make pip work with Python 3, see #1857.
+ # Explanation: pip messes with __file__ which interacts badly with the
+ # change in directory due to the 2to3 conversion. Therefore we restore
+ # __file__ to what it would have been otherwise.
+ global __file__
+ __file__ = os.path.join(os.curdir, os.path.basename(__file__))
+ if '--egg-base' in sys.argv:
+ # Change pip-egg-info entry to absolute path, so pip can find it
+ # after changing directory.
+ idx = sys.argv.index('--egg-base')
+ if sys.argv[idx + 1] == 'pip-egg-info':
+ sys.argv[idx + 1] = os.path.join(local_path, 'pip-egg-info')
+
old_path = os.getcwd()
os.chdir(src_path)
sys.path.insert(0, src_path)

0 comments on commit dba98cc

Please sign in to comment.