From fa2a3892f6bcab012fa39db433931e7f63548dcd Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 14 Jan 2019 20:21:47 +0000 Subject: [PATCH 1/3] Drop support for Python 2.6; add support for more recent Python versions. --- .travis.yml | 11 ++++------- test_polygon.py | 6 +----- test_polyhedron.py | 6 +----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc36b2a..a4a87f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,12 @@ language: python python: - - 2.6 - 2.7 - - 3.2 - - 3.3 - - 3.4 + - 3.5 + - 3.6 + - 3.7 - pypy -install: - - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi script: - - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then unit2 discover -v; else python -m unittest discover -v; fi + - python -m unittest discover -v; fi notifications: email: - dickinsm@gmail.com diff --git a/test_polygon.py b/test_polygon.py index 2327ba7..d292fe8 100644 --- a/test_polygon.py +++ b/test_polygon.py @@ -2,11 +2,7 @@ Tests for Polygon.winding_number. """ -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest from polygon import Polygon diff --git a/test_polyhedron.py b/test_polyhedron.py index 5d9e9d0..37ea971 100644 --- a/test_polyhedron.py +++ b/test_polyhedron.py @@ -2,11 +2,7 @@ Tests for Polyhedron winding number calculation. """ -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest try: import numpy From 164395945e62f52417a71e1be0aa3525d4df8bbe Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 14 Jan 2019 20:26:13 +0000 Subject: [PATCH 2/3] Fix accidentally leftover 'fi' --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a4a87f3..cac6c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - 3.7 - pypy script: - - python -m unittest discover -v; fi + - python -m unittest discover -v notifications: email: - dickinsm@gmail.com From 6a24c2c80c3e1792cfe2f65d122a50355b61cbb1 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 14 Jan 2019 20:29:36 +0000 Subject: [PATCH 3/3] Drop 3.7 in Travis CI configuration; it's not supported yet. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cac6c1e..4a406a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ python: - 2.7 - 3.5 - 3.6 - - 3.7 - pypy script: - python -m unittest discover -v