diff options
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/tools/bitmask-bootstrap.sh | 4 | ||||
| -rw-r--r-- | pkg/tools/upgrade_all.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkg/tools/bitmask-bootstrap.sh b/pkg/tools/bitmask-bootstrap.sh index 86d98791..3f494ccf 100755 --- a/pkg/tools/bitmask-bootstrap.sh +++ b/pkg/tools/bitmask-bootstrap.sh @@ -41,8 +41,8 @@ function clone_repo() function install_deps() { - cd ~/leap/bitmask-dev && pew in bitmask pip install -r pkg/requirements-dev.pip - cd ~/leap/bitmask-dev && pew in bitmask pip install -r pkg/requirements-testing.pip + cd ~/leap/bitmask-dev && pew in bitmask pip install -U -r pkg/requirements-dev.pip + cd ~/leap/bitmask-dev && pew in bitmask pip install -U -r pkg/requirements-testing.pip cd ~/leap/bitmask-dev && pew in bitmask make dev-all } diff --git a/pkg/tools/upgrade_all.py b/pkg/tools/upgrade_all.py index 0732285d..d297e42d 100644 --- a/pkg/tools/upgrade_all.py +++ b/pkg/tools/upgrade_all.py @@ -5,8 +5,13 @@ import pip from subprocess import call if not os.environ.get('VIRTUAL_ENV'): +<<<<<<< HEAD print('[!] Should call this script inside a virtualenv, I do not want to ' 'mess with your system. Bye!') +======= + print('[!] Should call this script inside a virtualenv, I do not want to mess ' + 'with your system. Bye!') +>>>>>>> 135aa3ac... [docs] add ability to upgrade an existing virtualenv sys.exit(1) for dist in pip.get_installed_distributions(): |