Skip to content

Commit 952f798

Browse files
committed
Merge branch 'master' of github.com:chrisdev/django-foundation-formtags
2 parents 9879b21 + e1176b1 commit 952f798

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.travis.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@ env:
99
- TOXENV=py27-django18
1010
- TOXENV=py27-django19
1111
- TOXENV=py27-django10
12+
- TOXENV=py27-django11
1213
- TOXENV=py27-django_trunk
1314
- TOXENV=py34-django18
1415
- TOXENV=py34-django19
1516
- TOXENV=py34-django10
17+
- TOXENV=py34-django11
1618
- TOXENV=py34-django_trunk
1719
- TOXENV=py35-django18
1820
- TOXENV=py35-django19
1921
- TOXENV=py35-django10
22+
- TOXENV=py35-django11
2023
- TOXENV=py35-django_trunk
2124

2225
install:
23-
- pip install --upgrade pip setuptools tox virtualenv codecov
26+
- pip install --upgrade pip
27+
- pip install --upgrade setuptools tox virtualenv codecov
2428

2529
script:
2630
- tox
@@ -32,6 +36,7 @@ matrix:
3236
- env: TOXENV=py35-django18
3337
- env: TOXENV=py35-django19
3438
- env: TOXENV=py35-django10
39+
- env: TOXENV=py35-django11
3540
- env: TOXENV=py35-django_trunk
3641

3742
after_success:

foundation_formtags/templatetags/foundation_formtags.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@register.filter
1212
def as_foundation(form):
1313
template = get_template("foundation_formtags/form.html")
14-
c = Context({"form": form})
14+
c = {"form": form}
1515
return template.render(c)
1616

1717

tox.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ exclude = docs/*
66

77
[tox]
88
envlist =
9-
py27-django{18,19,10},
10-
py34-django{18,19,10,_trunk},
11-
py35-django{18,19,10,_trunk}
9+
py27-django{18,19,10,11},
10+
py34-django{18,19,10,11,_trunk},
11+
py35-django{18,19,10,11,_trunk}
1212

1313
[testenv]
1414
basepython =
@@ -23,6 +23,7 @@ deps =
2323
django18: Django>=1.8,<1.9
2424
django19: Django>=1.9,<1.10
2525
django10: Django>==10
26+
django11: Django>=1.11,<1.12
2627
django_trunk: https://github.com/django/django/tarball/master
2728

2829
commands =

0 commit comments

Comments
 (0)