This commit is contained in:
Omer Katz 2014-12-28 11:14:50 +00:00
commit 66599c035c
3 changed files with 4 additions and 1 deletions

View File

@ -3,6 +3,7 @@ Django>=1.4.11
# Test requirements # Test requirements
pytest-django==2.6 pytest-django==2.6
pytest-xdist==1.11
pytest==2.5.2 pytest==2.5.2
pytest-cov==1.6 pytest-cov==1.6
flake8==2.2.2 flake8==2.2.2

View File

@ -5,11 +5,12 @@ import pytest
import sys import sys
import os import os
import subprocess import subprocess
import multiprocessing
PYTEST_ARGS = { PYTEST_ARGS = {
'default': ['tests'], 'default': ['tests'],
'fast': ['tests', '-q'], 'fast': ['tests', '-q', '-n %d' % multiprocessing.cpu_count()],
} }
FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501']

View File

@ -21,6 +21,7 @@ deps =
{py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
{py26,py27}-django16: django-oauth2-provider==0.2.4 {py26,py27}-django16: django-oauth2-provider==0.2.4
pytest-django==2.6.1 pytest-django==2.6.1
pytest-xdist==1.11
django-filter==0.7 django-filter==0.7
defusedxml==0.3 defusedxml==0.3
markdown>=2.1.0 markdown>=2.1.0