summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-04-10 09:24:23 -0400
committerJohn Szakmeister <john@szakmeister.net>2014-04-10 09:24:23 -0400
commit2e0275500c49b0227c564772fe41e99d21392026 (patch)
treeea0a20c5dc9f740c51e4bd4503829d9c27dfe407
parentdaf2c38eb4c4844af1b7cedcd60fe10547dd13d0 (diff)
parent62238d63f981568c4a870c93ef0509a9952246e9 (diff)
downloadnose-2e0275500c49b0227c564772fe41e99d21392026.tar.gz
Merge pull request #790 from mr-c/fix/nosetest-setup.cfg-ignore
setuptools nosetest command breaks build_ext
-rw-r--r--nose/commands.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/nose/commands.py b/nose/commands.py
index 99b3997..ef0e9ca 100644
--- a/nose/commands.py
+++ b/nose/commands.py
@@ -117,23 +117,27 @@ else:
# If we run 2to3 we can not do this inplace:
# Ensure metadata is up-to-date
- self.reinitialize_command('build_py', inplace=0)
- self.run_command('build_py')
+ build_py = self.get_finalized_command('build_py')
+ build_py.inplace = 0
+ build_py.run()
bpy_cmd = self.get_finalized_command("build_py")
build_path = bpy_cmd.build_lib
# Build extensions
- self.reinitialize_command('egg_info', egg_base=build_path)
- self.run_command('egg_info')
+ egg_info = self.get_finalized_command('egg_info')
+ egg_info.egg_base = build_path
+ egg_info.run()
- self.reinitialize_command('build_ext', inplace=0)
- self.run_command('build_ext')
+ build_ext = self.get_finalized_command('build_ext')
+ build_ext.inplace = 0
+ build_ext.run()
else:
self.run_command('egg_info')
# Build extensions in-place
- self.reinitialize_command('build_ext', inplace=1)
- self.run_command('build_ext')
+ build_ext = self.get_finalized_command('build_ext')
+ build_ext.inplace = 1
+ build_ext.run()
if self.distribution.install_requires:
self.distribution.fetch_build_eggs(