aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-14 02:33:21 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-14 02:33:21 +0100
commitf815525f184658ce291b3882b089dcc24036593f (patch)
tree6e8d9518595667cd0cefb66276c00e26420651a4
parent95226108662bf605a1a251914a5d6fcbc10063b1 (diff)
downloadmitmproxy-f815525f184658ce291b3882b089dcc24036593f.tar.gz
mitmproxy-f815525f184658ce291b3882b089dcc24036593f.tar.bz2
mitmproxy-f815525f184658ce291b3882b089dcc24036593f.zip
simplify virtualenv
- add dev.bat for Windows users - remove ~/.pipcache creation. If that causes issues with PyInstaller, we should use pip --no-cache-dir there or rm -r pip.locations.USER_CACHE_DIR. - remove superfluous pip install calls.
-rw-r--r--README.mkd2
-rwxr-xr-xdev12
-rw-r--r--dev.bat6
3 files changed, 8 insertions, 12 deletions
diff --git a/README.mkd b/README.mkd
index ce276764..d362fc69 100644
--- a/README.mkd
+++ b/README.mkd
@@ -65,7 +65,7 @@ To confirm that you're up and running, activate the virtualenv, and run the
mitmproxy test suite:
```
-$ source ../venv.mitmproxy/bin/activate
+$ ../venv.mitmproxy/bin/activate
$ nosetests ./test
```
Note that the main executables for the project - **mitmdump**, **mitmproxy** and
diff --git a/dev b/dev
index c8346af1..457b69cf 100755
--- a/dev
+++ b/dev
@@ -1,16 +1,6 @@
#!/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 \ No newline at end of file
diff --git a/dev.bat b/dev.bat
new file mode 100644
index 00000000..ca864806
--- /dev/null
+++ b/dev.bat
@@ -0,0 +1,6 @@
+@echo off
+set VENV=..\venv.mitmproxy
+
+virtualenv %VENV%
+call %VENV%\Scripts\activate.bat
+pip install --src .. -r requirements.txt \ No newline at end of file