diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-28 21:18:01 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-28 21:18:01 -0700 |
| commit | a4fde737b1a6d87e776b07836a04cc23f6aea08d (patch) | |
| tree | 49330c036fc2012ade631ff5ac7fa17d10b51c3a | |
| parent | f69972d13d9c6bfc5f59e71c1253b8d81003d064 (diff) | |
| download | mitmproxy-a4fde737b1a6d87e776b07836a04cc23f6aea08d.tar.gz mitmproxy-a4fde737b1a6d87e776b07836a04cc23f6aea08d.tar.bz2 mitmproxy-a4fde737b1a6d87e776b07836a04cc23f6aea08d.zip | |
fix appveyor
| -rw-r--r-- | .appveyor.yml | 16 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | dev.bat | 16 | ||||
| -rw-r--r-- | dev.ps1 | 16 |
4 files changed, 26 insertions, 26 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 5e487ff6..71840f1b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,9 +4,9 @@ build: off # Not a C# project environment: matrix: - PYTHON: "C:\\Python27" - TOXENV: "py27-ci" + TOXENV: "py27" - PYTHON: "C:\\Python35" - TOXENV: "py35-ci-win" + TOXENV: "py35" SNAPSHOT_HOST: secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI= @@ -22,18 +22,18 @@ install: - "python -m pip install --disable-pip-version-check -U pip" - "pip install -U tox" -before_test: - - "tox -e lint" - test_script: - "tox" deploy_script: ps: | - if(($Env:APPVEYOR_REPO_BRANCH -match "master") -or ($Env:APPVEYOR_REPO_TAG -match "true")) { + if( + ($Env:TOXENV -match "py27") -and + (($Env:APPVEYOR_REPO_BRANCH -match "simplify-tox") -or ($Env:APPVEYOR_REPO_TAG -match "true")) + ) { pip install -U virtualenv - .\dev.bat - python .\release\rtool.py bdist + .\dev.ps1 + cmd /c "python .\release\rtool.py bdist 2>&1" python .\release\rtool.py upload-snapshot --bdist } @@ -60,7 +60,7 @@ here_). Then do the following: git clone https://github.com/mitmproxy/mitmproxy.git cd mitmproxy - ./dev.sh + ./dev.sh # powershell .\dev.ps1 on Windows The *dev* script will create a virtualenv environment in a directory called @@ -74,7 +74,7 @@ mitmproxy test suite: .. code-block:: text - . venv/bin/activate # venv\Scripts\activate.bat on Windows + . venv/bin/activate # venv\Scripts\activate on Windows py.test Note that the main executables for the project - ``mitmdump``, ``mitmproxy``, diff --git a/dev.bat b/dev.bat deleted file mode 100644 index fe0824e0..00000000 --- a/dev.bat +++ /dev/null @@ -1,16 +0,0 @@ -@echo off -set VENV=.\venv - -virtualenv %VENV% --always-copy -if %errorlevel% neq 0 exit /b %errorlevel% -call %VENV%\Scripts\activate.bat -if %errorlevel% neq 0 exit /b %errorlevel% -python -m pip install --disable-pip-version-check -U pip -if %errorlevel% neq 0 exit /b %errorlevel% -pip install -r requirements.txt -if %errorlevel% neq 0 exit /b %errorlevel% - -echo. -echo * Created virtualenv environment in %VENV%. -echo * Installed all dependencies into the virtualenv. -echo * Activated virtualenv environment. diff --git a/dev.ps1 b/dev.ps1 new file mode 100644 index 00000000..7f329e8f --- /dev/null +++ b/dev.ps1 @@ -0,0 +1,16 @@ +$ErrorActionPreference = "Stop" +$VENV = ".\venv" + +virtualenv $VENV --always-copy +& $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. + * Installed all dependencies into the virtualenv. + * Activated virtualenv environment. + +"@
\ No newline at end of file |