Skip to content

Commit

Permalink
Merge pull request #78 from Relrin/travis-ci-3.6
Browse files Browse the repository at this point in the history
Added testing with Python 3.6 on Travis CI
  • Loading branch information
Relrin committed Dec 26, 2016
2 parents 9b5ddcb + 86f25f3 commit 56e5424
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: python
python:
- "3.4"
- "3.5"
- "3.6"
before_install:
- sudo apt-get update -qq
- sudo apt-get install python-dev
Expand All @@ -12,4 +13,4 @@ script:
- make flake
- make test_parallel
after_success:
- coveralls
- coveralls
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Django==1.10.2
flake8==2.5.2
pep8==1.7.0
pudb==2015.4.1
psycopg2==2.6.1
psycopg2==2.6.2
pyflakes==1.0.0
pylint==1.5.4
pytest==2.8.7
Expand Down
3 changes: 2 additions & 1 deletion tests/utils/date/test_timezone.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

EAT = get_fixed_timezone(180) # Africa/Nairobi
ICT = get_fixed_timezone(420) # Asia/Bangkok
INVALID_TIMEZONE = get_fixed_timezone(0.777)


def test_utc_class():
Expand Down Expand Up @@ -146,7 +147,7 @@ def test_make_naive(value, timezone, expected):


@pytest.mark.parametrize("value, timezone, exc_class", [
(dt.datetime(2011, 9, 1, 13, 20, 30), EAT, ValueError)
(dt.datetime(2011, 9, 1, 13, 20, 30), INVALID_TIMEZONE, ValueError)
])
def test_make_naive_value_error(value, timezone, exc_class):
with pytest.raises(exc_class):
Expand Down

0 comments on commit 56e5424

Please sign in to comment.