Merge branch 'master' into optional_join_in_invalid_asdict

* master:
  Sign contributors
  Ignore the new files tox creates
  Simplify tox by adding py-cover
  Don't try and build on Py32 on Travis
  Remove Python 3.2 classifier
  Remove Python 3.2 support
This commit is contained in:
OCHIAI, Gouji
2016-02-24 17:57:35 +09:00
5 changed files with 28 additions and 28 deletions

1
.gitignore vendored
View File

@@ -8,6 +8,7 @@
*.swp *.swp
.coverage .coverage
.tox/ .tox/
py*-cover.xml
coverage-*.xml coverage-*.xml
nosetests*.xml nosetests*.xml
env26/ env26/

View File

@@ -8,8 +8,6 @@ matrix:
env: TOXENV=py26 env: TOXENV=py26
- python: 2.7 - python: 2.7
env: TOXENV=py27 env: TOXENV=py27
- python: 3.2
env: TOXENV=py32
- python: 3.3 - python: 3.3
env: TOXENV=py33 env: TOXENV=py33
- python: 3.4 - python: 3.4

View File

@@ -132,3 +132,4 @@ Contributors
- Dmitry Bogun, 2015/09/10 - Dmitry Bogun, 2015/09/10
- Tinne Cahy, 2015/12/22 - Tinne Cahy, 2015/12/22
- Antti Haapala, 2016/01/17 - Antti Haapala, 2016/01/17
- Bert JW Regeer, 2016/02/16

View File

@@ -51,7 +51,6 @@ setup(name='colander',
"Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
@@ -73,4 +72,3 @@ setup(name='colander',
'docs': docs_extras, 'docs': docs_extras,
}, },
) )

16
tox.ini
View File

@@ -1,6 +1,6 @@
[tox] [tox]
envlist = envlist =
py26,py27,py32,py33,py34,py35,pypy,pypy3, py26,py27,py33,py34,py35,pypy,pypy3,
docs, docs,
{py2,py3}-cover,coverage {py2,py3}-cover,coverage
@@ -10,7 +10,6 @@ envlist =
basepython = basepython =
py26: python2.6 py26: python2.6
py27: python2.7 py27: python2.7
py32: python3.2
py33: python3.3 py33: python3.3
py34: python3.4 py34: python3.4
py35: python3.5 py35: python3.5
@@ -33,19 +32,22 @@ commands =
# we separate coverage into its own testenv because a) "last run wins" wrt # we separate coverage into its own testenv because a) "last run wins" wrt
# cobertura jenkins reporting and b) pypy and jython can't handle any # cobertura jenkins reporting and b) pypy and jython can't handle any
# combination of versions of coverage and nosexcover that i can find. # combination of versions of coverage and nosexcover that i can find.
[testenv:py2-cover]
[py-cover]
commands = commands =
pip install colander[testing] pip install colander[testing]
coverage run --source=colander {envbindir}/nosetests coverage run --source=colander {envbindir}/nosetests
coverage xml -o coverage-py2.xml coverage xml -o {envname}.xml
[testenv:py2-cover]
commands =
{[py-cover]commands}
setenv = setenv =
COVERAGE_FILE=.coverage.py2 COVERAGE_FILE=.coverage.py2
[testenv:py3-cover] [testenv:py3-cover]
commands = commands =
pip install colander[testing] {[py-cover]commands}
coverage run --source=colander {envbindir}/nosetests
coverage xml -o coverage-py3.xml
setenv = setenv =
COVERAGE_FILE=.coverage.py3 COVERAGE_FILE=.coverage.py3