Skip to content

Eliminating --no-site-packages from every call of virtualenv #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tellernotfound wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Eliminating --no-site-packages from every call of virtualenv #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
050fda4
Eliminating --no-site-packages from every call of virtualenv
Mar 16, 2020
d71028a
Merge branch 'master' into master
tellernotfound Jul 8, 2021
f9cbf02
Merge branch 'pebble-dev:master' into master
tellernotfound Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
*.pyc
.idea/*
.vscode
build
dist
6 changes: 3 additions & 3 deletions pebble_tool/sdk/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")],
Expand Down Expand Up @@ -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:
Expand All @@ -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'):
Expand Down
2 changes: 1 addition & 1 deletion pebble_tool/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version_base = (4, 6, 0)
version_suffix = 'rc2'
version_suffix = 'rc3'

if version_suffix is None:
__version_info__ = version_base
Expand Down