Skip to content

Commit

Permalink
Tox and TravisCI for Django 1.7
Browse files Browse the repository at this point in the history
Tox test with warnings on.
Ignore Coverage result file.
Don't need South for dev or testing (and ArmDev will prompt for it if necessary).
Embedy response toggled back to a non-https URL for Youtube.
  • Loading branch information
joncotton committed Sep 8, 2014
1 parent a1176fb commit 8136a8c
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.swp
*.egg-info
.tox/
.coverage
coverage*/
build/
mydatabase
Expand Down
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/backends/embedly.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='<iframe class="embedly-embed" src="//cdn.embedly.com/widgets/media.html?src=http%3A%2F%2Fwww.youtube.com%2Fembed%2F341Z3YW3mO0%3Ffeature%3Doembed&url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3D341Z3YW3mO0&image=http%3A%2F%2Fi.ytimg.com%2Fvi%2F341Z3YW3mO0%2Fhqdefault.jpg&key=internal&type=text%2Fhtml&schema=youtube" width="854" height="480" scrolling="no" frameborder="0" allowfullscreen></iframe>')
html='<iframe class="embedly-embed" src="//cdn.embedly.com/widgets/media.html?src=http%3A%2F%2Fwww.youtube.com%2Fembed%2F341Z3YW3mO0%3Ffeature%3Doembed&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3D341Z3YW3mO0&image=http%3A%2F%2Fi.ytimg.com%2Fvi%2F341Z3YW3mO0%2Fhqdefault.jpg&key=internal&type=text%2Fhtml&schema=youtube" width="854" height="480" scrolling="no" frameborder="0" allowfullscreen></iframe>')

self._test_response_data(url, data)
self._test_garbage_data_should_not_match_a_valid_response(url, data)
Expand Down
13 changes: 9 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -71,3 +71,8 @@ deps =
deps =
{[common]deps}
Django<1.7

[testenv:py27_dj17]
deps =
{[common]deps}
Django<1.8

0 comments on commit 8136a8c

Please sign in to comment.