execute also new tests in Travis

not a backport, necessary to make the tests runnable on 0.13 branch

Author: tomato42

.coveragerc

@@ -7,3 +7,5 @@ omit =
  ecdsa/six.py
  ecdsa/_version.py
  ecdsa/test_ecdsa.py
+ ecdsa/test_der.py
+ ecdsa/test_malformed_sigs.py

.travis.yml

@@ -1,7 +1,11 @@
 # workaround for 3.7 not available in default configuration
 # travis-ci/travis-ci#9815
 dist: trusty
+sudo: false
 language: python
+cache: pip
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
 python:
   - "2.6"
   - "2.7"
@@ -14,6 +18,8 @@ install:
   - if [[ -e build-requirements-${TRAVIS_PYTHON_VERSION}.txt ]]; then travis_retry pip install -r build-requirements-${TRAVIS_PYTHON_VERSION}.txt; else travis_retry pip install -r build-requirements.txt; fi
 script:
   - coverage run setup.py test
+  - if [[ $TRAVIS_PYTHON_VERSION != 3.2 && ! $TRAVIS_PYTHON_VERSION =~ py ]]; then tox -e py${TRAVIS_PYTHON_VERSION/./}; fi
+  - if [[ $TRAVIS_PYTHON_VERSION =~ py ]]; then tox -e $TRAVIS_PYTHON_VERSION; fi
   - python setup.py speed
 after_success:
   - coveralls

build-requirements-3.2.txt

@@ -7,3 +7,4 @@ PyYAML<3.13
 tox<3.0
 wheel<0.30
 virtualenv==15.2.0
+pytest>2.7.3

build-requirements-3.3.txt

@@ -2,3 +2,4 @@ python-coveralls
 tox<3.0
 wheel<0.30
 virtualenv==15.2.0
+pluggy<0.6

build-requirements.txt

@@ -1 +1,4 @@
 python-coveralls
+pytest>3.0.7
+pytest-cov<2.7.0
+tox

ecdsa/test_der.py

@@ -6,7 +6,7 @@
 except ImportError:
     import unittest
 from .der import remove_integer, UnexpectedDER, read_length
-from six import b
+from .six import b
 
 class TestRemoveInteger(unittest.TestCase):
     # DER requires the integers to be 0-padded only if they would be

ecdsa/test_malformed_sigs.py

@@ -3,7 +3,7 @@
 import pytest
 import hashlib
 
-from six import b, binary_type
+from .six import b, binary_type
 from .keys import SigningKey, VerifyingKey
 from .keys import BadSignatureError
 from .util import sigencode_der, sigencode_string

tox.ini

@@ -0,0 +1,18 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, py36, py37, pypy, pypy3
+
+
+[testenv]
+deps =
+     py{33}: py<1.5
+     py{33}: pytest<3.3
+     py{26}: unittest2
+     py{26,27,34,35,36,37,py,py3}: pytest
+     py{33}: wheel<0.30
+     coverage
+
+commands = coverage run --branch -m pytest
+
+[testenv:coverage]
+sitepackages=True
+commands = coverage run --branch -m pytest