From e204c2d7e75fb427c415521a044683d994aefe7b Mon Sep 17 00:00:00 2001
From: Hubert Kario <hkario@redhat.com>
Date: Fri, 4 Oct 2019 21:31:19 +0200
Subject: [PATCH] execute also new tests in Travis

---
 .coveragerc                |  2 ++
 .travis.yml                |  6 ++++++
 build-requirements-3.2.txt |  1 +
 build-requirements-3.3.txt |  1 +
 build-requirements.txt     |  3 +++
 tox.ini                    | 18 ++++++++++++++++++
 6 files changed, 31 insertions(+)
 create mode 100644 tox.ini

diff --git a/.coveragerc b/.coveragerc
index 71240e0a..23c667f9 100644
--- a/.coveragerc
+++ b/.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
diff --git a/.travis.yml b/.travis.yml
index 5e7a67aa..6319f719 100644
--- a/.travis.yml
+++ b/.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
diff --git a/build-requirements-3.2.txt b/build-requirements-3.2.txt
index 3b599b55..4995efa0 100644
--- a/build-requirements-3.2.txt
+++ b/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
diff --git a/build-requirements-3.3.txt b/build-requirements-3.3.txt
index de3e0b74..e4b5e775 100644
--- a/build-requirements-3.3.txt
+++ b/build-requirements-3.3.txt
@@ -2,3 +2,4 @@ python-coveralls
 tox<3.0
 wheel<0.30
 virtualenv==15.2.0
+pluggy<0.6
diff --git a/build-requirements.txt b/build-requirements.txt
index ae10411c..6c9f5447 100644
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -1 +1,4 @@
 python-coveralls
+pytest>3.0.7
+pytest-cov<2.7.0
+tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..db7754bf
--- /dev/null
+++ b/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