diff --git a/.gitignore b/.gitignore
index c33827a..b4a358c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.swp
*.egg-info
.tox/
+.coverage
coverage*/
build/
mydatabase
diff --git a/.travis.yml b/.travis.yml
index 0d8d554..a48a569 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,17 @@ install:
- pip install .
- pip install coverage coveralls Django==$DJANGO_VERSION
env:
- - DJANGO_VERSION=1.6.5
- - DJANGO_VERSION=1.5.8
- - DJANGO_VERSION=1.4.13
+ - DJANGO_VERSION=1.7
+ - DJANGO_VERSION=1.6.7
+ - DJANGO_VERSION=1.5.10
+ - DJANGO_VERSION=1.4.15
- DJANGO_VERSION=1.3.7
script: coverage run -m armstrong.dev.dev_django test
after_success: coveralls
+matrix:
+ exclude:
+ - python: 2.6
+ env: DJANGO_VERSION=1.7
notifications:
email: false
irc:
diff --git a/requirements/dev.txt b/requirements/dev.txt
index cd5470b..7ca414c 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,4 @@
armstrong.dev>=2.0,<3.0
armstrong.core.arm_layout>=1.3.0,<2.0
fudge==1.0.3
-south>=1.0,<2.0
lxml
diff --git a/tests/backends/embedly.py b/tests/backends/embedly.py
index 949a508..dfe66cd 100644
--- a/tests/backends/embedly.py
+++ b/tests/backends/embedly.py
@@ -121,7 +121,7 @@ def test_youtube_response(self):
title="The I Files - Investigate Your World",
author_name="The I Files",
author_url="http://www.youtube.com/user/theifilestv",
- html='')
+ html='')
self._test_response_data(url, data)
self._test_garbage_data_should_not_match_a_valid_response(url, data)
diff --git a/tox.ini b/tox.ini
index 30447d8..eadc14a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,19 +7,19 @@
[tox]
envlist =
py26_dj13, py26_dj14, py26_dj15, py26_dj16,
- py27_dj13, py27_dj14, py27_dj15, py27_dj16
+ py27_dj13, py27_dj14, py27_dj15, py27_dj16, py27_dj17
[testenv]
basepython = python2.7
commands =
- {envpython} -m armstrong.dev.dev_django test {posargs}
+ {envpython} -Wall -m armstrong.dev.dev_django test {posargs}
; coverage run -m armstrong.dev.dev_django test {posargs}
; coverage html --directory coverage_{envname}
[common]
deps =
- -r{toxinidir}/requirements/dev.txt
-; coverage
+ -r{toxinidir}/requirements/dev.txt
+ coverage
[py26_common]
deps =
@@ -71,3 +71,8 @@ deps =
deps =
{[common]deps}
Django<1.7
+
+[testenv:py27_dj17]
+deps =
+ {[common]deps}
+ Django<1.8