diff --git a/README.rst b/README.rst index 8cd193f..44d5be7 100644 --- a/README.rst +++ b/README.rst @@ -76,6 +76,14 @@ Publishing a release Change log ========== +v1.0.0 +------ + +- Travis CI builds pass. +- Added Python 3.4 support. +- Added Django 1.7 and Django 1.8 support. +- Dropped Python 2.6 support. + v0.16.0 ------- diff --git a/django_tables2/__init__.py b/django_tables2/__init__.py index 771e04c..6f4514d 100644 --- a/django_tables2/__init__.py +++ b/django_tables2/__init__.py @@ -12,4 +12,4 @@ except ImportError: pass -__version__ = "0.16.1.dev0" +__version__ = "1.0.0.dev0" diff --git a/tox.ini b/tox.ini index fef81db..d0f3611 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,10 @@ common = unittest-xml-reporting for-dj = django-haystack +for-dj18 = + django-haystack +for-dj17 = + django-haystack for-dj16 = django-haystack for-dj15 = @@ -29,6 +33,8 @@ for-dj12 = [django] latest = http://github.com/django/django/tarball/master +1.8.x = Django>=1.8,<1.9 +1.7.x = Django>=1.7,<1.8 1.6.x = Django>=1.6,<1.7 1.5.x = Django>=1.5,<1.6 1.4.x = Django>=1.4,<1.5 @@ -43,6 +49,45 @@ deps = {[django]latest} Sphinx +; -- python 3.4 --------------------------------------------------------------- + +[testenv:py34-dj] +basepython = python3.4 +commands = + python {envbindir}/coverage run setup.py test [] +deps = + {[libs]common} + {[libs]for-dj} + {[django]latest} + +[testenv:py34-dj18] +basepython = python3.4 +deps = + {[libs]common} + {[libs]for-dj18} + {[django]1.8.x} + +[testenv:py34-dj17] +basepython = python3.4 +deps = + {[libs]common} + {[libs]for-dj17} + {[django]1.7.x} + +[testenv:py34-dj16] +basepython = python3.4 +deps = + {[libs]common} + {[libs]for-dj16} + {[django]1.6.x} + +[testenv:py34-dj15] +basepython = python3.4 +deps = + {[libs]common} + {[libs]for-dj15} + {[django]1.5.x} + ; -- python 3.3 --------------------------------------------------------------- [testenv:py33-dj] @@ -54,6 +99,20 @@ deps = {[libs]for-dj} {[django]latest} +[testenv:py33-dj18] +basepython = python3.3 +deps = + {[libs]common} + {[libs]for-dj18} + {[django]1.8.x} + +[testenv:py33-dj17] +basepython = python3.3 +deps = + {[libs]common} + {[libs]for-dj17} + {[django]1.7.x} + [testenv:py33-dj16] basepython = python3.3 deps = @@ -79,6 +138,20 @@ deps = {[libs]for-dj} {[django]latest} +[testenv:py32-dj18] +basepython = python3.2 +deps = + {[libs]common} + {[libs]for-dj18} + {[django]1.8.x} + +[testenv:py32-dj17] +basepython = python3.2 +deps = + {[libs]common} + {[libs]for-dj17} + {[django]1.7.x} + [testenv:py32-dj16] basepython = python3.2 deps = @@ -140,51 +213,3 @@ deps = {[libs]common} {[libs]for-dj12} {[django]1.2.x} - -; -- python 2.6 --------------------------------------------------------------- - -[testenv:py26-dj] -basepython = python2.6 -commands = - python {envbindir}/coverage run setup.py test [] -deps = - {[libs]common} - {[libs]for-dj} - {[django]latest} - -[testenv:py26-dj16] -basepython = python2.6 -deps = - {[libs]common} - {[libs]for-dj16} - {[django]1.6.x} - -[testenv:py26-dj15] -basepython = python2.6 -deps = - {[libs]common} - {[libs]for-dj15} - {[django]1.5.x} - -[testenv:py26-dj14] -basepython = python2.6 -deps = - {[libs]common} - {[libs]for-dj14} - {[django]1.4.x} - -[testenv:py26-dj13] -basepython = python2.6 -deps = - {[libs]common} - {[libs]for-dj13} - {[django]1.3.x} - -[testenv:py26-dj12] -basepython = python2.6 -commands = - python {envbindir}/coverage run setup.py test [] -deps = - {[libs]common} - {[libs]for-dj12} - {[django]1.2.x}