Skip to content

Commit

Permalink
Merge pull request #4 from hugovk/update-versions
Browse files Browse the repository at this point in the history
Add Python 3.6, drop unsupported 2.6, 3.3
  • Loading branch information
Bernhard10 authored Oct 16, 2017
2 parents 1b096f0 + 2d2fbaf commit da5e9d6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ python:
- pypy
- pypy3
- 2.7
- 3.6
- 3.5
- 2.6
- 3.3
- 3.4

install:
- python setup.py install
- pip install coverage
- pip install pep8
- pip install pyflakes
- if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi

script:
- coverage run --include=warnaserror.py -m nose -vx tests/test_*.py
Expand Down
5 changes: 1 addition & 4 deletions tests/test_fake.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"""
from __future__ import print_function, unicode_literals

try:
import unittest2 as unittest
except ImportError:
import unittest
import unittest


class TestFake(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion warnaserror.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


class WarnAsError(Plugin):
"""Treat warnings that occur DURIONG tests as errors."""
"""Treat warnings that occur DURING tests as errors."""
enabled = False

def options(self, parser, env):
Expand Down

0 comments on commit da5e9d6

Please sign in to comment.