From 050fda47ae2181ee2d51d1aa385f1427ada9499a Mon Sep 17 00:00:00 2001 From: Stefano Africano Date: Mon, 16 Mar 2020 16:50:11 +0100 Subject: [PATCH] Eliminating --no-site-packages from every call of virtualenv --- .gitignore | 3 +++ pebble_tool/sdk/manager.py | 6 +++--- pebble_tool/version.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4710d26..fcb6a68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.pyc .idea/* +.vscode +build +dist \ No newline at end of file diff --git a/pebble_tool/sdk/manager.py b/pebble_tool/sdk/manager.py index 1752df2..1fbf1f8 100644 --- a/pebble_tool/sdk/manager.py +++ b/pebble_tool/sdk/manager.py @@ -114,7 +114,7 @@ def _install_from_handle(self, f): t.extractall(path) virtualenv_path = os.path.join(path, ".env") print("Preparing virtualenv... (this may take a while)") - subprocess.check_call([sys.executable, "-m", "virtualenv", virtualenv_path, "--no-site-packages"]) + subprocess.check_call([sys.executable, "-m", "virtualenv", virtualenv_path]) print("Installing dependencies...") subprocess.check_call([os.path.join(virtualenv_path, "bin", "python"), "-m", "pip", "install", "-r", os.path.join(path, "sdk-core", "requirements.txt")], @@ -241,7 +241,7 @@ def make_tintin_sdk(self, path): os.symlink(os.path.join(build_path, 'qemu_spi_flash.bin'), os.path.join(pebble_path, platform, 'qemu', 'qemu_spi_flash.bin')) - os.symlink(os.path.join(sdk_path, 'common/'), + os.symlink(os.path.join(sdk_path, 'common/'), os.path.join(pebble_path, 'common')) with open(os.path.join(dest_path, 'manifest.json'), 'w') as f: @@ -253,7 +253,7 @@ def make_tintin_sdk(self, path): }, f) print("Preparing virtualenv... (this may take a while)") - subprocess.check_call([sys.executable, "-m", "virtualenv", env_path, "--no-site-packages"]) + subprocess.check_call([sys.executable, "-m", "virtualenv", env_path]) print("Installing dependencies...") print("This may fail installing Pillow==2.0.0. In that case, question why we still force 2.0.0 anyway.") if sys.platform.startswith('darwin'): diff --git a/pebble_tool/version.py b/pebble_tool/version.py index 6297484..f3daace 100644 --- a/pebble_tool/version.py +++ b/pebble_tool/version.py @@ -1,5 +1,5 @@ version_base = (4, 6, 0) -version_suffix = 'rc1' +version_suffix = 'rc3' if version_suffix is None: __version_info__ = version_base