diff options
| author | Tom Christie | 2014-11-17 18:17:59 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-17 18:17:59 +0000 |
| commit | d2537e51a53d23f00d94ffce900ad5d0e7369eea (patch) | |
| tree | de344fd89234ccf2b1f51d36a2a751c6fecc009d | |
| parent | 5f580cad523a4133e9805a7dfac4bf239d295a1e (diff) | |
| parent | 2444e6a7937f53d0832f872aebee85f85074c37b (diff) | |
| download | django-rest-framework-d2537e51a53d23f00d94ffce900ad5d0e7369eea.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | docs/topics/contributing.md | 14 | ||||
| -rw-r--r-- | tox.ini | 24 |
3 files changed, 40 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a5b6d7d9..4c06acf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,16 @@ env: - TOX_ENV=py2.6-django1.5 - TOX_ENV=py2.7-django1.4 - TOX_ENV=py2.6-django1.4 + - TOX_ENV=py3.4-djangomaster + - TOX_ENV=py3.3-djangomaster + - TOX_ENV=py2.7-djangomaster + +matrix: + fast_finish: true + allow_failures: + - env: TOX_ENV=py3.4-djangomaster + - env: TOX_ENV=py3.3-djangomaster + - env: TOX_ENV=py2.7-djangomaster install: - "pip install tox --download-cache $HOME/.pip-cache" diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 6c289938..52f6e287 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -71,31 +71,31 @@ To run the tests, clone the repository, and then: Run using a more concise output style. - ./runtests -q + ./runtests.py -q Run the tests using a more concise output style, no coverage, no flake8. - ./runtests --fast + ./runtests.py --fast Don't run the flake8 code linting. - ./runtests --nolint + ./runtests.py --nolint Only run the flake8 code linting, don't run the tests. - ./runtests --lintonly + ./runtests.py --lintonly Run the tests for a given test case. - ./runtests MyTestCase + ./runtests.py MyTestCase Run the tests for a given test method. - ./runtests MyTestCase.test_this_method + ./runtests.py MyTestCase.test_this_method Shorter form to run the tests for a given test method. - ./runtests test_this_method + ./runtests.py test_this_method Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. @@ -5,7 +5,8 @@ envlist = py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4 + py2.7-django1.4,py2.6-django1.4, + py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster [testenv] commands = ./runtests.py --fast @@ -157,3 +158,24 @@ deps = django==1.4.11 django-oauth2-provider==0.2.3 django-guardian==1.2.3 pytest-django==2.6.1 + +[testenv:py3.4-djangomaster] +basepython = python3.4 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py3.3-djangomaster] +basepython = python3.3 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py2.7-djangomaster] +basepython = python3.2 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 |