Skip to content

Commit

Permalink
Merge pull request #9 from cloudify-cosmo/fix-requirement-files-not-b…
Browse files Browse the repository at this point in the history
…eing-dealt-with-correctly

fixed failure when trying to wheel a package that has dependencies in…
  • Loading branch information
nir0s committed Oct 18, 2015
2 parents 5e92335 + 8d87e55 commit f67b4bf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def read(*parts):

setup(
name='wagon',
version='0.2.2',
version='0.2.3',
url='https://github.com/cloudify-cosmo/wagon',
author='Gigaspaces',
author_email='cosmo-admin@gigaspaces.com',
Expand Down
8 changes: 7 additions & 1 deletion wagon/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,14 @@ def wheel(package, requirement_files=False, wheels_path='package',
wheel_cmd.append('--wheel-dir={0}'.format(wheels_path))
wheel_cmd.append('--find-links={0}'.format(wheels_path))
if requirement_files:
wheel_cmd_with_reqs = wheel_cmd
for req_file in requirement_files:
wheel_cmd.extend(['-r', req_file])
wheel_cmd_with_reqs.extend(['-r', req_file])
p = run(' '.join(wheel_cmd_with_reqs))
if not p.returncode == 0:
lgr.error('Could not download wheels for: {0}. '
'Please verify that the file you are trying '
'to wheel is wheelable.'.format(req_file))
wheel_cmd.append(package)
p = run(' '.join(wheel_cmd))
if not p.returncode == 0:
Expand Down

0 comments on commit f67b4bf

Please sign in to comment.