Skip to content

Commit

Permalink
Merge pull request #5 from mdickinson/update-python-versions
Browse files Browse the repository at this point in the history
Drop support for Python 2.6; update Python versions in Travis CI
  • Loading branch information
mdickinson authored Jan 14, 2019
2 parents 87c3c71 + 6a24c2c commit 3c816b8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
language: python
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
- 3.6
- 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
notifications:
email:
- dickinsm@gmail.com
6 changes: 1 addition & 5 deletions test_polygon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

try:
import numpy
Expand Down
6 changes: 1 addition & 5 deletions test_polyhedron.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3c816b8

Please sign in to comment.