Skip to content

Commit a1c310d

Browse files
committed
Merge branch 'release/0.8.7' into develop
2 parents b253168 + 8ba07b7 commit a1c310d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

model_blocks/tests.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def test_with_excluded_fields(self):
306306

307307
template = Template(('{% load model_tags %}'
308308
'{% with pepulator_factory_pepulator_detail_template="pepulator_factory/pepulator_detail.html" %}'
309-
'{% with pepulator_factory_pepulator_exclude="knuckles, jambs" %}'
309+
'{% with pepulator_factory_pepulator_exclude="knuckles, jambs, color" %}'
310310
'{% detail_block pepulator %}'
311311
'{% endwith %}'
312312
'{% endwith %}'))
@@ -319,7 +319,6 @@ def test_with_excluded_fields(self):
319319
"height,height,12,"
320320
"width,width,15,"
321321
"manufacture_date,manufacture date,2011-06-10 11:12:33,"
322-
"color,color,red,"
323322
"distributed_by,distributed by,Walmart,"
324323
)
325324
detail = template.render(context)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
sys.exit(1)
1212

1313
setup(name='django-model-blocks',
14-
version='0.8.6',
14+
version='0.8.7',
1515
description=('Simple filters and tags for generic Django '
1616
'model template partials'),
1717
long_description=long_description,

0 commit comments

Comments
 (0)