Skip to content

Commit

Permalink
CFY-7579 Install a compatible setuptools version (#19)
Browse files Browse the repository at this point in the history
* CFY-7579 Add a PREINSTALL_MODULES list

For installing modules before installing actual requirements, for
things that are required to install dev-requirements.txt (setuptools)

* Bump version to 4.0.1

* Fixup logs
  • Loading branch information
tehasdf authored and mcouthon committed Nov 21, 2017
1 parent a9b9440 commit 5463a66
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions agent_packager/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
DEFAULT_OUTPUT_TAR_PATH = '{0}-{1}-agent.tar.gz'
DEFAULT_VENV_PATH = 'cloudify/env'

PREINSTALL_MODULES = [
'setuptools==36.8.0'
]

EXTERNAL_MODULES = [
'celery==3.1.17'
]
Expand Down Expand Up @@ -264,6 +268,8 @@ def _install(modules, venv, final_set):
:param dict final_set: dict to populate with modules.
"""
installer = ModuleInstaller(modules, venv, final_set)
lgr.info('Installing modules required by setup...')
installer.install_modules(PREINSTALL_MODULES)
lgr.info('Installing module from requirements file...')
installer.install_requirements_file()
lgr.info('Installing external modules...')
Expand Down
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='cloudify-agent-packager',
version='4.0.0',
version='4.0.1',
url='https://github.com/cloudify-cosmo/cloudify-agent-packager',
author='Gigaspaces',
author_email='[email protected]',
Expand Down

0 comments on commit 5463a66

Please sign in to comment.