diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-03-14 03:10:14 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-14 03:10:14 +0100 |
commit | 274e6217de0cfc0d22f077f4163ed8794de9bd8b (patch) | |
tree | 84f82f7ee050e483db4fffc436b7b59fa7cb4619 | |
parent | 95226108662bf605a1a251914a5d6fcbc10063b1 (diff) | |
parent | e9a5a26bf07bc1013a72e35b743963b709e1997b (diff) | |
download | mitmproxy-274e6217de0cfc0d22f077f4163ed8794de9bd8b.tar.gz mitmproxy-274e6217de0cfc0d22f077f4163ed8794de9bd8b.tar.bz2 mitmproxy-274e6217de0cfc0d22f077f4163ed8794de9bd8b.zip |
Merge pull request #517 from mitmproxy/virtualenv-win
simplify virtualenv
-rw-r--r-- | README.mkd | 4 | ||||
-rwxr-xr-x | dev | 17 | ||||
-rw-r--r-- | dev.bat | 11 |
3 files changed, 19 insertions, 13 deletions
@@ -64,8 +64,8 @@ checkouts will be reflected live in the virtualenv. To confirm that you're up and running, activate the virtualenv, and run the mitmproxy test suite: -``` -$ source ../venv.mitmproxy/bin/activate +```shell +$ source ../venv.mitmproxy/bin/activate # ..\venv.mitmproxy\Scripts\activate.bat on Windows $ nosetests ./test ``` Note that the main executables for the project - **mitmdump**, **mitmproxy** and @@ -1,16 +1,11 @@ #!/bin/sh VENV=../venv.mitmproxy -PIP="$VENV/bin/pip --cache-dir ~/.pipcache" - -echo "This script sets up the following:" -echo "\t~/.pipcache - A pip cache directory" -echo "\t$VENV - A development virtualenv" - -mkdir -p ~/.pipcache virtualenv $VENV source $VENV/bin/activate -$PIP install -r ./requirements.txt -# Re-install these to make them editable -$PIP install --editable ../netlib -$PIP install --editable ../pathod +pip install --src .. -r requirements.txt + +echo "" +echo "* Created virtualenv environment in $VENV." +echo "* Installed all dependencies into the virtualenv." +echo "* Activated virtualenv environment."
\ No newline at end of file diff --git a/dev.bat b/dev.bat new file mode 100644 index 00000000..303c804e --- /dev/null +++ b/dev.bat @@ -0,0 +1,11 @@ +@echo off +set VENV=..\venv.mitmproxy + +virtualenv %VENV% +call %VENV%\Scripts\activate.bat +pip install --src .. -r requirements.txt + +echo. +echo * Created virtualenv environment in %VENV%. +echo * Installed all dependencies into the virtualenv. +echo * Activated virtualenv environment.
\ No newline at end of file |