Skip to content

Commit 1f48ebf

Browse files
committed
Merge pull request #236 from blueyed/tests-update-deps
Tests: update deps
2 parents 385a36a + 5b1a2cd commit 1f48ebf

File tree

2 files changed

+375
-375
lines changed

2 files changed

+375
-375
lines changed

generate_configurations.py

Lines changed: 3 additions & 3 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

@@ -110,7 +110,7 @@ def commands(uid, env):
110110
yield 'sh -c "dropdb %(name)s;' \
111111
' createdb %(name)s || exit 0"' % {'name': db_name}
112112

113-
yield 'py.test --ds=pytest_django_test.settings_%s --strict -r fEsxXw {posargs}' % env.settings
113+
yield 'py.test --ds=pytest_django_test.settings_%s --strict -r fEsxXw {posargs:tests}' % env.settings
114114

115115

116116
def testenv_name(env):

0 commit comments

Comments
 (0)