Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support optional dependencies spec from conda 4.4 #2001

Merged
merged 1 commit into from
May 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion conda_build/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ def parse(data, config, path=None):
'requirements/host': list,
'requirements/run': list,
'requirements/conflicts': list,
'requirements/run_constrained': list,
'test/requires': list,
'test/files': list,
'test/source_files': list,
Expand Down Expand Up @@ -370,7 +371,7 @@ def _git_clean(source_meta):
'pin_depends', 'include_recipe', # pin_depends is experimental still
'preferred_env', 'preferred_env_executable_paths',
],
'requirements': ['build', 'host', 'run', 'conflicts'],
'requirements': ['build', 'host', 'run', 'conflicts', 'run_constrained'],
'app': ['entry', 'icon', 'summary', 'type', 'cli_opts',
'own_environment'],
'test': ['requires', 'commands', 'files', 'imports', 'source_files'],
Expand Down Expand Up @@ -961,6 +962,11 @@ def info_index(self):
if preferred_env:
d['preferred_env'] = preferred_env

# conda 4.4+ optional dependencies
constrains = self.get_value('requirements/run_constrained')
if constrains:
d['constrains'] = constrains

if self.get_value('build/features'):
d['features'] = ' '.join(self.get_value('build/features'))
if self.get_value('build/track_features'):
Expand Down Expand Up @@ -1276,10 +1282,12 @@ def get_output_metadata(self, output):
if hasattr(output_reqs, 'keys'):
build_reqs = output_reqs.get('build', []) + requirements.get('build', [])
run_reqs = output_reqs.get('run', [])
constrain_reqs = output_reqs.get('run_constrained', [])
else:
output_reqs = ensure_list(output_reqs)
build_reqs = output_reqs + requirements.get('build', [])
run_reqs = output_reqs
constrain_reqs = []
if 'name' in output:
# since we are copying reqs from the top-level package, which
# can depend on subpackages, make sure that we filter out
Expand All @@ -1290,6 +1298,8 @@ def get_output_metadata(self, output):

requirements['build'] = build_reqs
requirements['run'] = run_reqs
if constrain_reqs:
requirements['run_constrained'] = constrain_reqs
output_metadata.meta['requirements'] = requirements
output_metadata.meta['package']['version'] = output.get('version') or self.version()
extra = self.meta.get('extra', {})
Expand Down
7 changes: 7 additions & 0 deletions tests/test-recipes/metadata/_run_constrained/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package:
name: test_run_constrained
version: 1.0

requirements:
run_constrained:
- bzip2 1.*
9 changes: 9 additions & 0 deletions tests/test_api_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -998,3 +998,12 @@ def test_only_lua_env(testing_config):
testing_config.prefix_length = 80
testing_config.set_build_id = False
api.build(recipe, config=testing_config)


def test_run_constrained_stores_constrains_info(testing_config):
recipe = os.path.join(metadata_dir, '_run_constrained')
out_file = api.build(recipe, config=testing_config)[0]
info_contents = json.loads(package_has_file(out_file, 'info/index.json'))
assert 'constrains' in info_contents
assert len(info_contents['constrains']) == 1
assert info_contents['constrains'][0] == 'bzip2 1.*'