Skip to content

Commit 3c816b8

Browse files
authored
Merge pull request #5 from mdickinson/update-python-versions
Drop support for Python 2.6; update Python versions in Travis CI
2 parents 87c3c71 + 6a24c2c commit 3c816b8

3 files changed

Lines changed: 5 additions & 17 deletions

File tree

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
language: python
22
python:
3-
- 2.6
43
- 2.7
5-
- 3.2
6-
- 3.3
7-
- 3.4
4+
- 3.5
5+
- 3.6
86
- pypy
9-
install:
10-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
117
script:
12-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then unit2 discover -v; else python -m unittest discover -v; fi
8+
- python -m unittest discover -v
139
notifications:
1410
email:
1511
- dickinsm@gmail.com

test_polygon.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
Tests for Polygon.winding_number.
33
44
"""
5-
import sys
6-
if sys.version_info >= (2, 7):
7-
import unittest
8-
else:
9-
import unittest2 as unittest
5+
import unittest
106

117
try:
128
import numpy

test_polyhedron.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
Tests for Polyhedron winding number calculation.
33
44
"""
5-
import sys
6-
if sys.version_info >= (2, 7):
7-
import unittest
8-
else:
9-
import unittest2 as unittest
5+
import unittest
106

117
try:
128
import numpy

0 commit comments

Comments
 (0)