diff --git a/README.rst b/README.rst index dfc6f57..1fcc2ed 100644 --- a/README.rst +++ b/README.rst @@ -30,6 +30,12 @@ Requirements +------------------+------------+--------------+ | Dbsettings | Python | Django | +==================+============+==============+ +| ==0.10 | 3.4 - 3.5 | 1.7 - 1.10 | +| +------------+--------------+ +| | 3.2 - 3.3 | 1.7 - 1.8 | +| +------------+--------------+ +| | 2.7 | 1.7 - 1.10 | ++------------------+------------+--------------+ | ==0.9 | 3.4 - 3.5 | 1.7 - 1.9 | | +------------+--------------+ | | 3.2 - 3.3 | 1.7 - 1.8 | @@ -487,6 +493,8 @@ some of the settings provided earlier in this document:: Changelog ========= +**0.10.0** (25/09/2016) + - Added compatibility with Django 1.10 **0.9.3** (02/06/2016) - Fixed (hopefully for good) problem with ImageValue in Python 3 (thanks rolexCoder) **0.9.2** (01/05/2016) diff --git a/setup.py b/setup.py index 437f1f9..3ae8f6e 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup # Dynamically calculate the version based on dbsettings.VERSION -version_tuple = (0, 9, 3) +version_tuple = (0, 10, 0) if version_tuple[2] is not None: if type(version_tuple[2]) == int: version = "%d.%d.%s" % version_tuple diff --git a/tox.ini b/tox.ini index 9d976da..283022d 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,8 @@ envlist = py3-dj-1.7.X, py3-dj-1.8.X, py3-dj-1.9.X, + py3-dj-1.10.X, + dj-1.10.X, dj-1.9.X, dj-1.8.X, dj-1.7.X, @@ -16,11 +18,17 @@ commands = deps = +[testenv:py3-dj-1.10.X] +basepython = python3.5 +deps = + {[testenv]deps} + Django>=1.10,<1.11 + [testenv:py3-dj-1.9.X] basepython = python3.5 deps = {[testenv]deps} - Django>=1.8,<1.9 + Django>=1.9,<1.10 [testenv:py3-dj-1.8.X] basepython = python3.2 @@ -34,6 +42,11 @@ deps = {[testenv]deps} Django>=1.7,<1.8 +[testenv:dj-1.10.X] +deps = + {[testenv]deps} + Django>=1.10,<1.11 + [testenv:dj-1.9.X] deps = {[testenv]deps}