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

.gitignore

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

.travis.yml

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

CONTRIBUTORS.txt

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

setup.py

@@ -43,21 +43,20 @@ setup(name='colander',
       version='1.2',
       description=('A simple schema-based serialization and deserialization '
                    'library'),
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
-        "Intended Audience :: Developers",
+          "Intended Audience :: Developers",
-        "Programming Language :: Python",
+          "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
+          "Programming Language :: Python :: 2",
-        "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",
+          "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: CPython",
+          "Programming Language :: Python :: Implementation :: PyPy",
-        "Programming Language :: Python :: Implementation :: PyPy",
+          ],
-        ],
       keywords='serialize deserialize validate schema validation',
       author="Agendaless Consulting",
       author_email="pylons-discuss@googlegroups.com",
@@ -66,11 +65,10 @@ setup(name='colander',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
+      install_requires=requires,
       test_suite="colander",
-      extras_require = {
+      extras_require={
-          'testing':testing_extras,
+          'testing': testing_extras,
-          'docs':docs_extras,
+          'docs': docs_extras,
           },
       )
-

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py32,py33,py34,py35,pypy,pypy3,
+    py26,py27,py33,py34,py35,pypy,pypy3,
     docs,
     {py2,py3}-cover,coverage
 
@@ -10,7 +10,6 @@ envlist =
 basepython =
     py26: python2.6
     py27: python2.7
-    py32: python3.2
     py33: python3.3
     py34: python3.4
     py35: python3.5
@@ -33,19 +32,22 @@ commands =
 # 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
 # combination of versions of coverage and nosexcover that i can find.
-[testenv:py2-cover]
+
+[py-cover]
 commands =
     pip install colander[testing]
     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 =
     COVERAGE_FILE=.coverage.py2
 
 [testenv:py3-cover]
 commands =
-    pip install colander[testing]
+    {[py-cover]commands}
-    coverage run --source=colander {envbindir}/nosetests
-    coverage xml -o coverage-py3.xml
 setenv =
     COVERAGE_FILE=.coverage.py3