From 9c553327223eaa66411e44d203158649af21fd26 Mon Sep 17 00:00:00 2001 From: David THENON Date: Wed, 1 Feb 2017 11:14:58 +0100 Subject: [PATCH] Validate Django 1.10 support through Tox, updated docs and setup.py --- README.rst | 2 +- docs/changelog.rst | 14 +++++++++----- docs/index.rst | 2 +- docs/requirements.txt | 2 +- setup.py | 7 +++++-- tox.ini | 4 +++- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 53ccc3f..b8590db 100644 --- a/README.rst +++ b/README.rst @@ -20,5 +20,5 @@ Links Requires ======== -* `Django`_ >=1.7, <1.9; +* `Django`_ >=1.8, <=1.10; * `django-crispy-forms`_ >= 1.4.x; diff --git a/docs/changelog.rst b/docs/changelog.rst index 3ac5c60..466c9c1 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,18 +4,22 @@ Changelog ========= -Devel - Unreleased -****************** +Version 0.5.5 - Unreleased +************************** +* Dropped support for Python 2.6 and Django<1.8; * Added default app settings file; * Added project test structure; * Added pretty simple tests to cover layout elements which include some code; * Added demo app taken from crispy-form-foundation-demo; * Added dev and test requirements files; * Updated setup.py; -* Added and enabled minified basic assets for Foundation 5 and 6; -* Finished urls/templates dynamic structure to work on every versions; -* Dropped support for Python 2.6 and Django<1.8; +* Added and enabled minified basic assets for Foundation 5 and 6 for test and demo; +* Finished demo urls/templates to work on every Foundation versions; +* Fixed Flake issues; +* Validated test with Tox for Python 2.7, Python 3.5 and Django>=1.8,<=1.10; + +Everything should still work as with previous version. Version 0.5.4 ************* diff --git a/docs/index.rst b/docs/index.rst index 1274733..bf6cde7 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -23,7 +23,7 @@ Links Requires ======== -* `Django`_ >=1.7, <1.9; +* `Django`_ >=1.8, <=1.10; * `django-crispy-forms`_ >= 1.4.x; Table of contents diff --git a/docs/requirements.txt b/docs/requirements.txt index 078d5c1..c57efa3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -Django>=1.8,<1.9 +Django>=1.8,<1.10 crispy-forms-foundation diff --git a/setup.py b/setup.py index f23672d..cd8e9d5 100644 --- a/setup.py +++ b/setup.py @@ -14,19 +14,22 @@ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 1.7", "Framework :: Django :: 1.8", + "Framework :: Django :: 1.9", + "Framework :: Django :: 1.10", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Software Development :: Libraries :: Python Modules", ], install_requires=[ - 'Django>=1.7,<1.9', + 'Django>=1.8,<1.11', 'django-crispy-forms >= 1.4' ], include_package_data=True, diff --git a/tox.ini b/tox.ini index ddb17c3..55282c2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py27-django18, py27-django19, py35-django18, py35-django19 +envlist = py27-django18, py27-django19, py27-django110, py35-django18, py35-django19, py35-django110 [testenv] # changedir = project_test @@ -8,8 +8,10 @@ envlist = py27-django18, py27-django19, py35-django18, py35-django19 deps = py27-django18: Django>=1.8,<1.9 py27-django19: Django>=1.9,<1.10 + py27-django110: Django>=1.10,<1.11 py35-django18: Django>=1.8,<1.9 py35-django19: Django>=1.9,<1.10 + py35-django110: Django>=1.10,<1.11 commands = pip install -r requirements/tests.txt