Skip to content

Tests: update deps #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2015
Merged

Tests: update deps #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ccd031
test config: update: pytest 2.7.0, pytest-xdist 1.12
blueyed May 9, 2015
cf6b5e5
tox.ini: use {posargs:tests} (defaults to tests)
blueyed May 9, 2015
5b1a2cd
Regenerate tox.ini
blueyed May 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions generate_configurations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def is_pypy(self):
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']
PYTEST_VERSIONS = ['2.7.0']
DJANGO_VERSIONS = ['1.3', '1.4', '1.5', '1.6', '1.7', '1.8', 'master']
SETTINGS = ['sqlite', 'sqlite_file', 'mysql_myisam', 'mysql_innodb',
'postgres']
Expand Down Expand Up @@ -78,7 +78,7 @@ def is_valid_env(env):

def requirements(env):
yield 'pytest==%s' % (env.pytest_version)
yield 'pytest-xdist==1.11'
yield 'pytest-xdist==1.12'
yield DJANGO_REQUIREMENTS[env.django_version]
yield 'django-configurations==0.8'

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

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


def testenv_name(env):
Expand Down
Loading