diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | README.rst | 9 | ||||
| -rwxr-xr-x | pkg/tools/bitmask-bootstrap.sh | 4 | ||||
| -rw-r--r-- | pkg/tools/upgrade_all.py | 5 |
4 files changed, 32 insertions, 14 deletions
@@ -8,24 +8,28 @@ dev-bootstrap: pkg/tools/bitmask-bootstrap.sh dev-mail: - pip install -e '.[mail]' + pip install -U -e '.[mail]' dev-gui: install_pixelated - pip install -e '.[gui]' -dev-backend: - pip install -e '.[backend]' + pip install -U -e '.[gui]' -dev-latest-backend: dev-backend - pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common' - pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad' +dev-backend: + pip install -U -e '.[backend]' dev-all: install_pixelated pip install -I --install-option="--bundled" pysqlcipher - pip install -e '.[all]' + pip install -U -e '.[all]' + +dev-latest-leap: + pip install -U -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common' + pip install -U -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad' + +dev-latest-backend: dev-backend dev-latest-leap + +dev-latest-all: dev-all dev-latest-leap -dev-latest-all: dev-all - pip install -e 'git+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common' - pip install -e 'git+https://0xacab.org/leap/soledad@master#egg=leap.soledad' +upgrade-all: + python pkg/tools/upgrade_all.py uninstall: pip uninstall leap.bitmask @@ -38,7 +42,7 @@ test_e2e: tests/e2e/e2e-test-vpn.sh test_functional_setup: - pip install behave selenium + pip install -U behave selenium test_functional: xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags @smoke tests/functional/features -k -D host=localhost @@ -113,6 +113,15 @@ debian-based system, you can try:: make dev-bootstrap +To upgrade regularly the python dependencies installed inside your virtualenv, +you can run:: + + make upgrade-all + +inside your virtualenv, and it will install any new version of your +dependencies that is found in pypi. + + Run headless backend in development mode +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/pkg/tools/bitmask-bootstrap.sh b/pkg/tools/bitmask-bootstrap.sh index 86d9879..3f494cc 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 0732285..d297e42 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(): |