From 64b4334e5a9b365e43fe3cc3777b7dafc5851dc7 Mon Sep 17 00:00:00 2001 From: Richard Frank Date: Thu, 18 Feb 2016 21:19:06 -0500 Subject: [PATCH] BLD: Use build_requires with conda build --- conda/zipline/meta.yaml | 2 +- setup.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conda/zipline/meta.yaml b/conda/zipline/meta.yaml index 282e60ae..ebb82b5c 100644 --- a/conda/zipline/meta.yaml +++ b/conda/zipline/meta.yaml @@ -13,7 +13,7 @@ source: requirements: build: - python - {% for req in data.get('setup_requires', []) -%} + {% for req in data.get('build_requires', []) -%} - {{req}} {% endfor %} run: diff --git a/setup.py b/setup.py index 71cb5aed..51c14997 100644 --- a/setup.py +++ b/setup.py @@ -206,7 +206,8 @@ def extras_requires(conda_format=False): } -def module_requirements(requirements_path, module_names, strict_bounds): +def module_requirements(requirements_path, module_names, strict_bounds, + conda_format=False): module_names = set(module_names) found = set() module_lines = [] @@ -219,6 +220,8 @@ def module_requirements(requirements_path, module_names, strict_bounds): name = match.group(1) if name in module_names: found.add(name) + if conda_format: + line = _conda_format(line) module_lines.append(line) if found != module_names: @@ -232,7 +235,8 @@ conda_build = os.path.basename(sys.argv[0]) == 'conda-build' setup_requires = module_requirements( 'etc/requirements.txt', ('Cython', 'numpy'), - strict_bounds=False, + strict_bounds=conda_build, + conda_format=conda_build, ) setup(