aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbond <will@wbond.net>2016-12-06 13:26:54 -0500
committerwbond <will@wbond.net>2016-12-06 13:26:54 -0500
commit05745f3e133b2368fd3ed23940f7e962331b1ca8 (patch)
tree4de12bf8db9a290d86b56c7b5b1b6e869b9829a3
parent1d6209bdd7cda231003ee20895c9feefd38a42a0 (diff)
downloadasn1crypto-05745f3e133b2368fd3ed23940f7e962331b1ca8.tar.gz
Tweaks for running coverage on CI
-rw-r--r--.travis.yml6
-rw-r--r--appveyor.yml4
-rw-r--r--dev/ci.py5
3 files changed, 10 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 83f8792..d77bb9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,7 +93,11 @@ install:
fi
fi
else
- pip install flake8 coverage;
+ if [ "$PYTHON_VERSION" == "3.2" ]; then
+ pip install flake8;
+ else
+ pip install flake8 coverage;
+ fi
export PYTHON_BIN=python;
fi
script:
diff --git a/appveyor.yml b/appveyor.yml
index c292dca..aad688d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -59,9 +59,9 @@ install:
if (!(Test-Path "${env:PYTMP}\get-pip.py")) {
(New-Object Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', "${env:PYTMP}\get-pip.py");
}
- & "${env:PYTHON}\python.exe" "${env:PYTMP}\get-pip.py";
+ & "${env:PYTHON}\python.exe" -W ignore "${env:PYTMP}\get-pip.py";
# Skip flake8 for 2.6 since flake8 and pycodestyle have deprecated support for it
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install coverage;
+ & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'coverage'])";
} else {
& "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install flake8 coverage;
diff --git a/dev/ci.py b/dev/ci.py
index 335d101..e68f4b6 100644
--- a/dev/ci.py
+++ b/dev/ci.py
@@ -27,7 +27,8 @@ def run():
sys.stdout.flush()
tests_result = run_tests()
- print('\nRunning coverage.py')
- run_coverage(write_xml=True)
+ if sys.version_info < (3, 0) or sys.version_info >= (3, 3):
+ print('\nRunning coverage.py')
+ run_coverage(write_xml=True)
return lint_result and tests_result