From 7c0ccebeb50ba5216fdd436e0a74ec3b8bdbf6f0 Mon Sep 17 00:00:00 2001 From: Ahmed Bilal Khalid Date: Thu, 29 Aug 2019 23:14:51 +0500 Subject: [PATCH] a --- app/api.py | 1 - app/file.py | 1 - app/helper.py | 5 +++-- app/host.py | 1 - app/image.py | 1 - init.sh | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/api.py b/app/api.py index 57e5ebc..c3a4d56 100644 --- a/app/api.py +++ b/app/api.py @@ -70,5 +70,4 @@ def setup(path, auth_name, auth_seed, auth_realm, ) shutil.copytree(src=os.path.join(repo_name, "etcd3_wrapper"), dst=os.path.join(repo_name, "ucloud_common", "etcd3_wrapper")) - op.add(PipenvOperation.create, path=repo_name, site_packages=True) op.add(PipenvOperation.install, path=repo_name) diff --git a/app/file.py b/app/file.py index 4e82c50..a60b676 100644 --- a/app/file.py +++ b/app/file.py @@ -47,7 +47,6 @@ def setup(path, base_dir, file_prefix, etcd_url, etcd_password): url="https://code.ungleich.ch/ahmedbilal/etcd3_wrapper", ) - op_result.add(PipenvOperation.create, path=repo_name, site_packages=True) op_result.add(PipenvOperation.install, path=repo_name) # Write Crontab entry diff --git a/app/helper.py b/app/helper.py index d91ca74..d328c50 100644 --- a/app/helper.py +++ b/app/helper.py @@ -82,10 +82,11 @@ class PipenvOperation(object): @staticmethod def install(path=".", package_name=None): + pip_install_options = "PIP_INSTALL_OPTION=\"-- --jobs=6\"" if package_name: - command = f"pipenv install {package_name}" + command = f"{pip_install_options} pipenv install {package_name}" else: - command = f"pipenv install" + command = f"{pip_install_options} pipenv install" try: output = subprocess.check_output(command.split(), cwd=path) except subprocess.CalledProcessError as e: diff --git a/app/host.py b/app/host.py index 4a1c663..87983e4 100644 --- a/app/host.py +++ b/app/host.py @@ -61,5 +61,4 @@ def setup(path, ssh_username, ssh_key_path, ssh_key_pass, etcd_url, etcd_passwor shutil.copytree(src=os.path.join(repo_name, "etcd3_wrapper"), dst=os.path.join(repo_name, "ucloud_common", "etcd3_wrapper")) - op_result.add(PipenvOperation.create, path=repo_name, site_packages=True) op_result.add(PipenvOperation.install, path=repo_name) diff --git a/app/image.py b/app/image.py index 8702659..cdcb2d7 100644 --- a/app/image.py +++ b/app/image.py @@ -46,7 +46,6 @@ def setup(path, base_dir, etcd_url, etcd_password): url="https://code.ungleich.ch/ahmedbilal/etcd3_wrapper", ) - op_result.add(PipenvOperation.create, path=repo_name, site_packages=True) op_result.add(PipenvOperation.install, path=repo_name) # Write Crontab entry diff --git a/init.sh b/init.sh index d0be12e..6df1e7c 100644 --- a/init.sh +++ b/init.sh @@ -24,7 +24,7 @@ pip2 install --upgrade pip # For CEPH pip2 install prettytable -pip3 install pipenv py3-grpcio +pip3 install pipenv pipenv install pipenv shell \ No newline at end of file