Removed support for Django 1.6 and Python 2.6

pull/876/head
Karl Hobley 2014-12-15 20:28:03 +00:00
rodzic 5e905fe7e7
commit b9ce897441
5 zmienionych plików z 5 dodań i 148 usunięć

Wyświetl plik

@ -1,15 +1,8 @@
language: python
env:
# - TOXENV=py26-dj16-postgres
- TOXENV=py26-dj16-sqlite
- TOXENV=py27-dj16-postgres
# - TOXENV=py27-dj16-sqlite
- TOXENV=py32-dj16-postgres
# - TOXENV=py33-dj16-postgres
- TOXENV=py34-dj16-postgres
- TOXENV=py27-dj17-postgres
# - TOXENV=py27-dj17-sqlite
# - TOXENV=py32-dj17-postgres
- TOXENV=py27-dj17-sqlite
- TOXENV=py32-dj17-postgres
# - TOXENV=py33-dj17-postgres
- TOXENV=py34-dj17-postgres

Wyświetl plik

@ -52,7 +52,7 @@ Available at `wagtail.readthedocs.org <http://wagtail.readthedocs.org/>`_ and al
Compatibility
~~~~~~~~~~~~~
Wagtail supports Django 1.6.2+ and 1.7.0+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4.
Wagtail supports Django 1.7.0+ on Python 2.7, 3.2, 3.3 and 3.4.
Wagtail's dependencies are summarised at `requirements.io <https://requires.io/github/torchbox/wagtail/requirements>`_.

Wyświetl plik

@ -3,7 +3,7 @@ Welcome to Wagtail's documentation
Wagtail is a modern, flexible CMS, built on Django.
It supports Django 1.6.2+ and 1.7rc3+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4.
It supports Django 1.7.0+ on Python 2.7, 3.2, 3.3 and 3.4.
.. toctree::
:maxdepth: 3

Wyświetl plik

@ -28,8 +28,7 @@ PY3 = sys.version_info[0] == 3
install_requires = [
"Django>=1.6.2,<1.8",
"South>=1.0.0",
"Django>=1.7.0,<1.8",
"django-compressor>=1.4",
"django-libsass>=0.2",
"django-modelcluster>=0.4",
@ -69,7 +68,6 @@ setup(
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',

134
tox.ini
Wyświetl plik

@ -1,6 +1,5 @@
[deps]
base =
South==1.0.0
django-compressor>=1.4
django-libsass>=0.2
libsass==0.5.1
@ -20,10 +19,6 @@ base =
Embedly
coverage
dj16 =
Django>=1.6,<1.7
dj17 =
Django>=1.7,<1.8
@ -38,14 +33,6 @@ skipsdist = True
usedevelop = True
envlist =
py26-dj16-postgres,
py26-dj16-sqlite,
py27-dj16-postgres,
py27-dj16-sqlite,
py32-dj16-postgres,
py33-dj16-postgres,
py34-dj16-postgres,
py27-dj17-postgres,
py27-dj17-sqlite,
py32-dj17-postgres,
@ -61,131 +48,10 @@ envlist =
# py26-dj16-mysql
# py27-dj16-mysql
# South fails with sqlite on python3, because it tries to use DryRunMigrator which uses iteritems
# py32-dj16-sqlite,
# py33-dj16-sqlite,
# py34-dj16-sqlite
[testenv]
commands=coverage run runtests.py
[testenv:py26-dj16-postgres]
basepython=python2.6
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
[testenv:py26-dj16-sqlite]
basepython=python2.6
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
setenv =
DATABASE_ENGINE=django.db.backends.sqlite3
[testenv:py26-dj16-mysql]
basepython=python2.6
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
MySQL-python==1.2.5
setenv =
DATABASE_ENGINE=django.db.backends.mysql
DATABASE_USER=wagtail
[testenv:py27-dj16-postgres]
basepython=python2.7
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
[testenv:py27-dj16-sqlite]
basepython=python2.7
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
setenv =
DATABASE_ENGINE=django.db.backends.sqlite3
[testenv:py27-dj16-mysql]
basepython=python2.7
deps =
{[deps]base}
{[deps]py2}
{[deps]dj16}
MySQL-python==1.2.5
setenv =
DATABASE_ENGINE=django.db.backends.mysql
DATABASE_USER=wagtail
[testenv:py32-dj16-postgres]
basepython=python3.2
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
[testenv:py32-dj16-sqlite]
basepython=python3.2
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
setenv =
DATABASE_ENGINE=django.db.backends.sqlite3
[testenv:py33-dj16-postgres]
basepython=python3.3
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
[testenv:py33-dj16-sqlite]
basepython=python3.3
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
setenv =
DATABASE_ENGINE=django.db.backends.sqlite3
[testenv:py34-dj16-postgres]
basepython=python3.4
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
psycopg2==2.5.3
setenv =
DATABASE_ENGINE=django.db.backends.postgresql_psycopg2
[testenv:py34-dj16-sqlite]
basepython=python3.4
deps =
{[deps]base}
{[deps]py3}
{[deps]dj16}
setenv =
DATABASE_ENGINE=django.db.backends.sqlite3
[testenv:py27-dj17-postgres]
basepython=python2.7