From bb70d16b925b867f5e25806f9fabc3ddfc440f0e Mon Sep 17 00:00:00 2001 From: Richard Frank Date: Fri, 26 Feb 2016 09:54:10 -0500 Subject: [PATCH] BLD: Fixed detection of windows conda build and fixed error during string formatting --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cad73dbd..9844a0ad 100644 --- a/setup.py +++ b/setup.py @@ -226,11 +226,12 @@ def module_requirements(requirements_path, module_names, strict_bounds, if found != module_names: raise AssertionError( - "No requirements found for %s." % module_names - found + "No requirements found for %s." % (module_names - found) ) return module_lines -conda_build = os.path.basename(sys.argv[0]) == 'conda-build' +conda_build = os.path.basename(sys.argv[0]) in ('conda-build', # unix + 'conda-build-script.py') # win setup_requires = module_requirements( 'etc/requirements.txt',