Skip to content

Commit 5463a66

Browse files
tehasdfmcouthon
authored andcommitted
CFY-7579 Install a compatible setuptools version (#19)
* 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
1 parent a9b9440 commit 5463a66

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

agent_packager/packager.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
DEFAULT_OUTPUT_TAR_PATH = '{0}-{1}-agent.tar.gz'
1515
DEFAULT_VENV_PATH = 'cloudify/env'
1616

17+
PREINSTALL_MODULES = [
18+
'setuptools==36.8.0'
19+
]
20+
1721
EXTERNAL_MODULES = [
1822
'celery==3.1.17'
1923
]
@@ -264,6 +268,8 @@ def _install(modules, venv, final_set):
264268
:param dict final_set: dict to populate with modules.
265269
"""
266270
installer = ModuleInstaller(modules, venv, final_set)
271+
lgr.info('Installing modules required by setup...')
272+
installer.install_modules(PREINSTALL_MODULES)
267273
lgr.info('Installing module from requirements file...')
268274
installer.install_requirements_file()
269275
lgr.info('Installing external modules...')

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def read(*parts):
1212

1313
setup(
1414
name='cloudify-agent-packager',
15-
version='4.0.0',
15+
version='4.0.1',
1616
url='https://github.com/cloudify-cosmo/cloudify-agent-packager',
1717
author='Gigaspaces',
1818
author_email='cosmo-admin@gigaspaces.com',

0 commit comments

Comments
 (0)