Skip to content

Commit 89237ad

Browse files
committed
tests: skip Django < 1.8 with Python 3.5
1 parent bd44b03 commit 89237ad

File tree

2 files changed

+12
-140
lines changed

2 files changed

+12
-140
lines changed

generate_configurations.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ def is_valid_env(env):
7878
env.django_version in ('1.7', '1.8', '1.9', 'master')):
7979
return False
8080

81+
# Python 3.5 is only supported by Django 1.8+
82+
if env.python_version == 'python3.5':
83+
return env.django_version in ('1.8', '1.9', 'master')
84+
8185
# pypy3 is compatible with Python 3.2, but Django 1.9 only supports Python 2.7, 3.4+.
8286
if env.python_version == 'pypy3' and env.django_version in ('1.9', 'master'):
8387
return False

tox.ini

Lines changed: 8 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,141 +1695,9 @@ setenv =
16951695
UID = 112
16961696

16971697

1698-
[testenv:python3.5-1.5-postgres]
1699-
commands =
1700-
sh -c "dropdb pytest_django_113; createdb pytest_django_113 || exit 0"
1701-
py.test --ds=pytest_django_test.settings_postgres --strict -r fEsxXw {posargs:tests}
1702-
basepython = python3.5
1703-
deps =
1704-
pytest==2.7.3
1705-
pytest-xdist==1.13.1
1706-
Django>=1.5,<1.6
1707-
django-configurations==0.8
1708-
psycopg2==2.6.1
1709-
setenv =
1710-
PYTHONPATH = {toxinidir}
1711-
UID = 113
1712-
1713-
1714-
[testenv:python3.5-1.5-sqlite]
1715-
commands =
1716-
py.test --ds=pytest_django_test.settings_sqlite --strict -r fEsxXw {posargs:tests}
1717-
basepython = python3.5
1718-
deps =
1719-
pytest==2.7.3
1720-
pytest-xdist==1.13.1
1721-
Django>=1.5,<1.6
1722-
django-configurations==0.8
1723-
setenv =
1724-
PYTHONPATH = {toxinidir}
1725-
UID = 114
1726-
1727-
1728-
[testenv:python3.5-1.5-sqlite_file]
1729-
commands =
1730-
py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw {posargs:tests}
1731-
basepython = python3.5
1732-
deps =
1733-
pytest==2.7.3
1734-
pytest-xdist==1.13.1
1735-
Django>=1.5,<1.6
1736-
django-configurations==0.8
1737-
setenv =
1738-
PYTHONPATH = {toxinidir}
1739-
UID = 115
1740-
1741-
1742-
[testenv:python3.5-1.6-postgres]
1743-
commands =
1744-
sh -c "dropdb pytest_django_116; createdb pytest_django_116 || exit 0"
1745-
py.test --ds=pytest_django_test.settings_postgres --strict -r fEsxXw {posargs:tests}
1746-
basepython = python3.5
1747-
deps =
1748-
pytest==2.7.3
1749-
pytest-xdist==1.13.1
1750-
Django>=1.6,<1.7
1751-
django-configurations==0.8
1752-
psycopg2==2.6.1
1753-
setenv =
1754-
PYTHONPATH = {toxinidir}
1755-
UID = 116
1756-
1757-
1758-
[testenv:python3.5-1.6-sqlite]
1759-
commands =
1760-
py.test --ds=pytest_django_test.settings_sqlite --strict -r fEsxXw {posargs:tests}
1761-
basepython = python3.5
1762-
deps =
1763-
pytest==2.7.3
1764-
pytest-xdist==1.13.1
1765-
Django>=1.6,<1.7
1766-
django-configurations==0.8
1767-
setenv =
1768-
PYTHONPATH = {toxinidir}
1769-
UID = 117
1770-
1771-
1772-
[testenv:python3.5-1.6-sqlite_file]
1773-
commands =
1774-
py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw {posargs:tests}
1775-
basepython = python3.5
1776-
deps =
1777-
pytest==2.7.3
1778-
pytest-xdist==1.13.1
1779-
Django>=1.6,<1.7
1780-
django-configurations==0.8
1781-
setenv =
1782-
PYTHONPATH = {toxinidir}
1783-
UID = 118
1784-
1785-
1786-
[testenv:python3.5-1.7-postgres]
1787-
commands =
1788-
sh -c "dropdb pytest_django_119; createdb pytest_django_119 || exit 0"
1789-
py.test --ds=pytest_django_test.settings_postgres --strict -r fEsxXw {posargs:tests}
1790-
basepython = python3.5
1791-
deps =
1792-
pytest==2.7.3
1793-
pytest-xdist==1.13.1
1794-
Django>=1.7,<1.8
1795-
django-configurations==0.8
1796-
psycopg2==2.6.1
1797-
setenv =
1798-
PYTHONPATH = {toxinidir}
1799-
UID = 119
1800-
1801-
1802-
[testenv:python3.5-1.7-sqlite]
1803-
commands =
1804-
py.test --ds=pytest_django_test.settings_sqlite --strict -r fEsxXw {posargs:tests}
1805-
basepython = python3.5
1806-
deps =
1807-
pytest==2.7.3
1808-
pytest-xdist==1.13.1
1809-
Django>=1.7,<1.8
1810-
django-configurations==0.8
1811-
setenv =
1812-
PYTHONPATH = {toxinidir}
1813-
UID = 120
1814-
1815-
1816-
[testenv:python3.5-1.7-sqlite_file]
1817-
commands =
1818-
py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw {posargs:tests}
1819-
basepython = python3.5
1820-
deps =
1821-
pytest==2.7.3
1822-
pytest-xdist==1.13.1
1823-
Django>=1.7,<1.8
1824-
django-configurations==0.8
1825-
setenv =
1826-
PYTHONPATH = {toxinidir}
1827-
UID = 121
1828-
1829-
18301698
[testenv:python3.5-1.8-postgres]
18311699
commands =
1832-
sh -c "dropdb pytest_django_122; createdb pytest_django_122 || exit 0"
1700+
sh -c "dropdb pytest_django_113; createdb pytest_django_113 || exit 0"
18331701
py.test --ds=pytest_django_test.settings_postgres --strict -r fEsxXw {posargs:tests}
18341702
basepython = python3.5
18351703
deps =
@@ -1840,7 +1708,7 @@ deps =
18401708
psycopg2==2.6.1
18411709
setenv =
18421710
PYTHONPATH = {toxinidir}
1843-
UID = 122
1711+
UID = 113
18441712

18451713

18461714
[testenv:python3.5-1.8-sqlite]
@@ -1854,7 +1722,7 @@ deps =
18541722
django-configurations==0.8
18551723
setenv =
18561724
PYTHONPATH = {toxinidir}
1857-
UID = 123
1725+
UID = 114
18581726

18591727

18601728
[testenv:python3.5-1.8-sqlite_file]
@@ -1868,12 +1736,12 @@ deps =
18681736
django-configurations==0.8
18691737
setenv =
18701738
PYTHONPATH = {toxinidir}
1871-
UID = 124
1739+
UID = 115
18721740

18731741

18741742
[testenv:python3.5-master-postgres]
18751743
commands =
1876-
sh -c "dropdb pytest_django_125; createdb pytest_django_125 || exit 0"
1744+
sh -c "dropdb pytest_django_116; createdb pytest_django_116 || exit 0"
18771745
py.test --ds=pytest_django_test.settings_postgres --strict -r fEsxXw {posargs:tests}
18781746
basepython = python3.5
18791747
deps =
@@ -1884,7 +1752,7 @@ deps =
18841752
psycopg2==2.6.1
18851753
setenv =
18861754
PYTHONPATH = {toxinidir}
1887-
UID = 125
1755+
UID = 116
18881756

18891757

18901758
[testenv:python3.5-master-sqlite]
@@ -1898,7 +1766,7 @@ deps =
18981766
django-configurations==0.8
18991767
setenv =
19001768
PYTHONPATH = {toxinidir}
1901-
UID = 126
1769+
UID = 117
19021770

19031771

19041772
[testenv:python3.5-master-sqlite_file]
@@ -1912,4 +1780,4 @@ deps =
19121780
django-configurations==0.8
19131781
setenv =
19141782
PYTHONPATH = {toxinidir}
1915-
UID = 127
1783+
UID = 118

0 commit comments

Comments
 (0)