diff options
author | Maximilian Hils <git@maximilianhils.com> | 2017-01-30 00:38:40 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2017-01-30 00:40:24 +0100 |
commit | 3fe2f9578a19729196d5d775923beb597c8be032 (patch) | |
tree | c5d8abe673fa2fe0a166a64f044d2be0e10d00d5 | |
parent | f570c57006a79f31739d5270a4b72eae1b1ab740 (diff) | |
download | mitmproxy-3fe2f9578a19729196d5d775923beb597c8be032.tar.gz mitmproxy-3fe2f9578a19729196d5d775923beb597c8be032.tar.bz2 mitmproxy-3fe2f9578a19729196d5d775923beb597c8be032.zip |
always use 'venv' as virtualenv folder
-rw-r--r-- | README.rst | 8 | ||||
-rw-r--r-- | dev.ps1 | 7 | ||||
-rwxr-xr-x | dev.sh | 18 |
3 files changed, 15 insertions, 18 deletions
@@ -69,9 +69,9 @@ To get started hacking on mitmproxy, please follow the `advanced installation`_ ./dev.sh # "powershell .\dev.ps1" on Windows -The *dev* script will create a `virtualenv`_ environment in a directory called -"venv3.5", and install all mandatory and optional dependencies into it. The -primary mitmproxy components - mitmproxy and pathod - are installed as +The *dev* script will create a `virtualenv`_ environment in a directory called "venv" +and install all mandatory and optional dependencies into it. The primary +mitmproxy components - mitmproxy and pathod - are installed as "editable", so any changes to the source in the repository will be reflected live in the virtualenv. @@ -82,7 +82,7 @@ you can run them like any other command: .. code-block:: text - . venv3.5/bin/activate # "venv\Scripts\activate" on Windows + . venv/bin/activate # "venv\Scripts\activate" on Windows mitmdump --version Testing @@ -1,20 +1,19 @@ $ErrorActionPreference = "Stop" -$VENV = ".\venv" $pyver = python --version if($pyver -notmatch "3\.[5-9]") { Write-Warning "Unexpected Python version, expected Python 3.5 or above: $pyver" } -python -m venv $VENV --copies -& $VENV\Scripts\activate.ps1 +python -m venv .\venv --copies +& .\venv\Scripts\activate.ps1 python -m pip install --disable-pip-version-check -U pip cmd /c "pip install -r requirements.txt 2>&1" echo @" - * Created virtualenv environment in $VENV. + * Created virtualenv environment in .\venv. * Installed all dependencies into the virtualenv. * Activated virtualenv environment. @@ -2,16 +2,14 @@ set -e set -x -PYVERSION=${1:-3.5} -VENV="venv$PYVERSION" +echo "Creating dev environment in ./venv..." -echo "Creating dev environment in $VENV using Python $PYVERSION" - -python$PYVERSION -m venv "$VENV" -. "$VENV/bin/activate" -pip$PYVERSION install -U pip setuptools -pip$PYVERSION install -r requirements.txt +python3 -m venv venv +. venv/bin/activate +pip3 install -U pip setuptools +pip3 install -r requirements.txt echo "" -echo "* Virtualenv created in $VENV and all dependencies installed." -echo "* You can now activate the $(python --version) virtualenv with this command: \`. $VENV/bin/activate\`" +echo " * Created virtualenv environment in ./venv." +echo " * Installed all dependencies into the virtualenv." +echo " * You can now activate the $(python3 --version) virtualenv with this command: \`. venv/bin/activate\`"
\ No newline at end of file |