Skip to content

Commit 6ccd031

Browse files
committed
test config: update: pytest 2.7.0, pytest-xdist 1.12
1 parent 385a36a commit 6ccd031

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

generate_configurations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def is_pypy(self):
2727
PYTHON_MAIN_VERSIONS = ['python2.7', 'python3.4']
2828
PYTHON_VERSIONS = ['python2.6', 'python2.7', 'python3.2', 'python3.3',
2929
'python3.4', 'pypy', 'pypy3']
30-
PYTEST_VERSIONS = ['2.6.4']
30+
PYTEST_VERSIONS = ['2.7.0']
3131
DJANGO_VERSIONS = ['1.3', '1.4', '1.5', '1.6', '1.7', '1.8', 'master']
3232
SETTINGS = ['sqlite', 'sqlite_file', 'mysql_myisam', 'mysql_innodb',
3333
'postgres']
@@ -78,7 +78,7 @@ def is_valid_env(env):
7878

7979
def requirements(env):
8080
yield 'pytest==%s' % (env.pytest_version)
81-
yield 'pytest-xdist==1.11'
81+
yield 'pytest-xdist==1.12'
8282
yield DJANGO_REQUIREMENTS[env.django_version]
8383
yield 'django-configurations==0.8'
8484

0 commit comments

Comments
 (0)