Skip to content

Commit

Permalink
Validate Django 1.10 support through Tox, updated docs and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
sveetch committed Feb 1, 2017
1 parent 62be1db commit 9c55332
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ Links
Requires
========

* `Django`_ >=1.7, <1.9;
* `Django`_ >=1.8, <=1.10;
* `django-crispy-forms`_ >= 1.4.x;
14 changes: 9 additions & 5 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
*************
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=1.8,<1.9
Django>=1.8,<1.10
crispy-forms-foundation
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@

[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
# Get the right django version following the current env
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
Expand Down

0 comments on commit 9c55332

Please sign in to comment.