diff --git a/.travis.yml b/.travis.yml index 019a754..3aedbb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,8 @@ language: python matrix: include: - # Django 1.9, Wagtail 1.9 - python: 2.7 - env: TOXENV=py27-django19-wagtail19 + env: TOXENV=py27-django111-wagtail113 install: - pip install tox codecov diff --git a/docs/conf.py b/docs/conf.py index 2c116d6..398a21f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,10 +55,10 @@ author = 'Lab Digital BV' # built documents. # # The short X.Y version. -version = '0.10.2' +version = '0.10.3' # The full version, including alpha/beta/rc tags. -release = '0.10.2' +release = '0.10.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index e7073a1..9c907f7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.10.2 +current_version = 0.10.3 commit = true tag = true tag_name = {new_version} diff --git a/setup.py b/setup.py index cd9aa09..f83e808 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import re from setuptools import find_packages, setup install_requires = [ - 'wagtail>=1.9,<1.11', + 'wagtail>=1.10,<1.14', 'user-agents>=1.0.1', 'wagtailfontawesome>=1.0.6', ] @@ -32,7 +32,7 @@ with open('README.rst') as fh: setup( name='wagtail-personalisation-molo', - version='0.10.2', + version='0.10.3', description='A forked version of Wagtail add-on for showing personalized content', author='Praekelt.org', author_email='dev@praekeltfoundation.org', diff --git a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html index 8828d7c..a11d3fd 100644 --- a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html +++ b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html @@ -22,7 +22,7 @@
{% if all_count %} {% for segment in object_list %} -
+

{{ segment }}

{% endif %}
diff --git a/tox.ini b/tox.ini index c4ca7bf..8a5d1ba 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,12 @@ [tox] -envlist = py{27}-django{19}-wagtail{19},lint +envlist = py{27}-django{111}-wagtail{113},lint [testenv] commands = coverage run --parallel -m pytest {posargs} extras = test deps = - django19: django>=1.9,<1.10 - wagtail19: wagtail>=1.9,<1.10 - wagtail110: wagtail>=1.10,<1.11 + django111: django>=1.11,<1.12 + wagtail19: wagtail>=1.13,<1.14 [testenv:coverage-report] basepython = python2.7