added Python 3.5 to build matrix and tox configs;

fixed Python 3.2 compatibility for testing
[skip ci]
This commit is contained in:
Michael Greene
2016-01-12 14:20:26 -08:00
parent 2e4b74668c
commit 890581880b
2 changed files with 25 additions and 6 deletions

View File

@@ -1,5 +1,6 @@
language: python
python:
- "3.5"
- "3.4"
- "3.3"
- "3.2"
@@ -9,8 +10,11 @@ python:
matrix:
include:
# add a pep8 test
- python: 3.4
- python: 3.5
env: TOXENV=pep8
# add a test of setup.py using python 3.5
- python: 3.5
env: TOXENV=setup35
# add a test of setup.py using python 3.4
- python: 3.4
env: TOXENV=setup34

25
tox.ini
View File

@@ -1,5 +1,5 @@
[tox]
envlist = pypy, pypy3, py27, py32, py33, py34, pep8, setup34, setup33, setup32, setup27
envlist = pypy, pypy3, py27, py32, py33, py34, py35, pep8, setup35, setup34, setup33, setup32, setup27
skipsdist = True
[pytest]
@@ -14,47 +14,62 @@ max-line-length = 160
[testenv]
passenv = HOME ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH PATH
deps =
py{py,py3,27,33,34}: cryptography>=0.8
py32: cryptography>=0.8,<0.9
py32: cffi<=1.1.0
# deps for everything
enum34
pyasn1
six>=1.7.2
singledispatch
pytest
pytest-cov
# deps for python != 3.2
py{py,py3,27,33,34,35}: cryptography>=0.8
# py32 is getting annoying to support
py32: cryptography>=0.8,<0.9
py32: cffi<=1.1.0
py32: coverage<=3.7.1
install_command = pip install {opts} --no-cache-dir {packages}
commands =
py.test --cov pgpy --cov-report term-missing tests/
[test-setup]
whitelist_externals = /usr/bin/rm
commands =
pip install -e .
rm -rf PGPy.egg-info
[testenv:setup35]
recreate = True
basepython = python3.5
whitelist_externals = {[test-setup]whitelist_externals}
commands = {[test-setup]commands}
[testenv:setup34]
recreate = True
basepython = python3.4
whitelist_externals = {[test-setup]whitelist_externals}
commands = {[test-setup]commands}
[testenv:setup33]
recreate = True
basepython = python3.3
whitelist_externals = {[test-setup]whitelist_externals}
commands = {[test-setup]commands}
[testenv:setup32]
recreate = True
basepython = python3.2
whitelist_externals = {[test-setup]whitelist_externals}
commands = {[test-setup]commands}
[testenv:setup27]
recreate = True
deps = pip
basepython = python2.7
whitelist_externals = {[test-setup]whitelist_externals}
commands = {[test-setup]commands}
[testenv:pep8]
basepython = python3.4
basepython = python3.5
deps =
flake8
pep8-naming