From 5463a665a4d20105b59f0552e46a10a3fd7693b1 Mon Sep 17 00:00:00 2001 From: Lukasz Maksymczuk Date: Tue, 21 Nov 2017 11:25:52 +0100 Subject: [PATCH] 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 --- agent_packager/packager.py | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/agent_packager/packager.py b/agent_packager/packager.py index c075e11..54209f2 100644 --- a/agent_packager/packager.py +++ b/agent_packager/packager.py @@ -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' ] @@ -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...') diff --git a/setup.py b/setup.py index f872b0b..9a797c1 100644 --- a/setup.py +++ b/setup.py @@ -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='cosmo-admin@gigaspaces.com',