diff --git a/.travis.yml b/.travis.yml index d70d5f1f8..70f637721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,10 @@ env: - TESTENV=python2.6-1.6-sqlite_file - TESTENV=python2.7-1.3-sqlite_file - TESTENV=python2.7-1.4-sqlite_file + - TESTENV=python2.7-1.5-sqlite_file + - TESTENV=python2.7-1.6-sqlite_file + - TESTENV=python2.7-1.7-sqlite_file + - TESTENV=python2.7-1.8-sqlite_file - TESTENV=python2.7-master-mysql_innodb - TESTENV=python2.7-master-mysql_myisam - TESTENV=python2.7-master-sqlite_file diff --git a/generate_configurations.py b/generate_configurations.py index da9e90de8..54c266fe5 100755 --- a/generate_configurations.py +++ b/generate_configurations.py @@ -24,6 +24,7 @@ def is_pypy(self): # Python to run tox. RUN_PYTHON = '3.4' +PYTHON_MAIN_VERSIONS = ['python2.7', 'python3.4'] PYTHON_VERSIONS = ['python2.6', 'python2.7', 'python3.2', 'python3.3', 'python3.4', 'pypy', 'pypy3'] PYTEST_VERSIONS = ['2.6.4'] @@ -160,6 +161,10 @@ def find_and_add(variations, env_getter): result.add(env) break + # Add all Django versions for each main python version (2.x and 3.x). + find_and_add(itertools.product(PYTHON_MAIN_VERSIONS, DJANGO_VERSIONS), + lambda env: (env.python_version, env.django_version)) + find_and_add(PYTHON_VERSIONS, lambda env: env.python_version) find_and_add(PYTEST_VERSIONS, lambda env: env.pytest_version) find_and_add(DJANGO_VERSIONS, lambda env: env.django_version) diff --git a/tox.ini b/tox.ini index db8b047aa..507f6fc81 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pypy-master-sqlite_file,pypy3-master-sqlite_file,python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-master-mysql_innodb,python2.7-master-mysql_myisam,python2.7-master-sqlite_file,python3.2-master-sqlite_file,python3.3-master-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-postgres,python3.4-master-sqlite,python3.4-master-sqlite_file,checkqa-python2.6,checkqa-python2.7,checkqa-python3.2,checkqa-python3.3,checkqa-python3.4,checkqa-pypy,checkqa-pypy3 +envlist = pypy-master-sqlite_file,pypy3-master-sqlite_file,python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-1.5-sqlite_file,python2.7-1.6-sqlite_file,python2.7-1.7-sqlite_file,python2.7-1.8-sqlite_file,python2.7-master-mysql_innodb,python2.7-master-mysql_myisam,python2.7-master-sqlite_file,python3.2-master-sqlite_file,python3.3-master-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-postgres,python3.4-master-sqlite,python3.4-master-sqlite_file,checkqa-python2.6,checkqa-python2.7,checkqa-python3.2,checkqa-python3.3,checkqa-python3.4,checkqa-pypy,checkqa-pypy3 [testenv] whitelist_externals =