Skip to content

Commit

Permalink
Add Python 3.6 to test matrix and update tests for support
Browse files Browse the repository at this point in the history
  • Loading branch information
grantjenks committed Mar 27, 2017
1 parent a77e7f6 commit 26050bb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "pypy"
- "pypy3"
install:
- pip install -r requirements.txt
script:
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ environment:
- PYTHON: "C:\\Python27"
- PYTHON: "C:\\Python34"
- PYTHON: "C:\\Python35"
- PYTHON: "C:\\Python36"
- PYTHON: "C:\\Python27-x64"
- PYTHON: "C:\\Python34-x64"
- PYTHON: "C:\\Python35-x64"
- PYTHON: "C:\\Python36-x64"

install:

Expand Down
12 changes: 10 additions & 2 deletions tests/test_djangocache.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# The entirety of this file was copied from:
# Most of this file was copied from:
# https://raw.githubusercontent.com/django/django/master/tests/cache/tests.py

# Unit tests for cache framework
Expand Down Expand Up @@ -51,8 +51,16 @@

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.settings')

import django
############################################################################
# GrantJ 2017-03-27 Ignore deprecation warnings. Django's metaclass magic does
# not always play well with Python 3.6. Read
# http://stackoverflow.com/questions/41343263/ for details
############################################################################

import warnings
warnings.filterwarnings('ignore', category=DeprecationWarning)

import django
django.setup()

from .models import Poll, expensive_calculation
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py27,py34,py35
envlist=py27,py34,py35,py36
[testenv]
deps=nose
mock
Expand Down

0 comments on commit 26050bb

Please sign in to comment.