minor fixes

This commit is contained in:
Maximilian Hils 2016-07-29 19:07:48 -07:00
parent 3b71c19af3
commit 63f64cd660
3 changed files with 6 additions and 6 deletions

View File

@ -5,10 +5,10 @@ environment:
CI_DEPS: codecov>=2.0.5
CI_COMMANDS: codecov
matrix:
- PYTHON: "C:\\Python27"
TOXENV: "py27"
- PYTHON: "C:\\Python35"
TOXENV: "py35"
- PYTHON: "C:\\Python27"
TOXENV: "py27"
SNAPSHOT_HOST:
secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI=
@ -31,7 +31,7 @@ deploy_script:
ps: |
if(
($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
.\dev.ps1

View File

@ -57,7 +57,7 @@ script: set -o pipefail; python -m tox -- --cov netlib --cov mitmproxy --cov pat
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
git fetch --unshallow
./dev.sh 3.5

View File

@ -12,7 +12,7 @@ import subprocess
import sys
import tarfile
import zipfile
from os.path import join, normpath, dirname, exists, basename
from os.path import join, abspath, normpath, dirname, exists, basename
import click
import pysftp
@ -34,7 +34,7 @@ else:
def Archive(name):
return tarfile.open(name, "w:gz")
ROOT_DIR = normpath(join(dirname(__file__), ".."))
ROOT_DIR = abspath(join(dirname(__file__), ".."))
RELEASE_DIR = join(ROOT_DIR, "release")
BUILD_DIR = join(RELEASE_DIR, "build")