mirror of
https://github.com/Grasscutters/mitmproxy.git
synced 2025-01-30 14:58:38 +00:00
minor fixes
This commit is contained in:
parent
3b71c19af3
commit
63f64cd660
@ -5,10 +5,10 @@ environment:
|
|||||||
CI_DEPS: codecov>=2.0.5
|
CI_DEPS: codecov>=2.0.5
|
||||||
CI_COMMANDS: codecov
|
CI_COMMANDS: codecov
|
||||||
matrix:
|
matrix:
|
||||||
- PYTHON: "C:\\Python27"
|
|
||||||
TOXENV: "py27"
|
|
||||||
- PYTHON: "C:\\Python35"
|
- PYTHON: "C:\\Python35"
|
||||||
TOXENV: "py35"
|
TOXENV: "py35"
|
||||||
|
- PYTHON: "C:\\Python27"
|
||||||
|
TOXENV: "py27"
|
||||||
|
|
||||||
SNAPSHOT_HOST:
|
SNAPSHOT_HOST:
|
||||||
secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI=
|
secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI=
|
||||||
@ -31,7 +31,7 @@ deploy_script:
|
|||||||
ps: |
|
ps: |
|
||||||
if(
|
if(
|
||||||
($Env:TOXENV -match "py35") -and
|
($Env:TOXENV -match "py35") -and
|
||||||
(($Env:APPVEYOR_REPO_BRANCH -match "builds") -or ($Env:APPVEYOR_REPO_TAG -match "true"))
|
(($Env:APPVEYOR_REPO_BRANCH -match "master") -or ($Env:APPVEYOR_REPO_TAG -match "true"))
|
||||||
) {
|
) {
|
||||||
pip install -U virtualenv
|
pip install -U virtualenv
|
||||||
.\dev.ps1
|
.\dev.ps1
|
||||||
|
@ -57,7 +57,7 @@ script: set -o pipefail; python -m tox -- --cov netlib --cov mitmproxy --cov pat
|
|||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- |
|
- |
|
||||||
if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "builds" || -n $TRAVIS_TAG) ]]
|
if [[ $BDIST == "1" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]]
|
||||||
then
|
then
|
||||||
git fetch --unshallow
|
git fetch --unshallow
|
||||||
./dev.sh 3.5
|
./dev.sh 3.5
|
||||||
|
@ -12,7 +12,7 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import tarfile
|
import tarfile
|
||||||
import zipfile
|
import zipfile
|
||||||
from os.path import join, normpath, dirname, exists, basename
|
from os.path import join, abspath, normpath, dirname, exists, basename
|
||||||
|
|
||||||
import click
|
import click
|
||||||
import pysftp
|
import pysftp
|
||||||
@ -34,7 +34,7 @@ else:
|
|||||||
def Archive(name):
|
def Archive(name):
|
||||||
return tarfile.open(name, "w:gz")
|
return tarfile.open(name, "w:gz")
|
||||||
|
|
||||||
ROOT_DIR = normpath(join(dirname(__file__), ".."))
|
ROOT_DIR = abspath(join(dirname(__file__), ".."))
|
||||||
RELEASE_DIR = join(ROOT_DIR, "release")
|
RELEASE_DIR = join(ROOT_DIR, "release")
|
||||||
|
|
||||||
BUILD_DIR = join(RELEASE_DIR, "build")
|
BUILD_DIR = join(RELEASE_DIR, "build")
|
||||||
|
Loading…
Reference in New Issue
Block a user