Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5d4dd84

Browse files
Implemented py.test runner in setup.py
1 parent b96d79d commit 5d4dd84

File tree

6 files changed

+93
-3184
lines changed

6 files changed

+93
-3184
lines changed

‎.travis.yml‎

Lines changed: 54 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,57 @@
1+
---
12
language: python
2-
python: 3.5
33
sudo: false
4-
install: pip install tox
5-
script: tox
4+
cache: pip
5+
matrix:
6+
exclude:
7+
- python: "3.2"
8+
env: DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
9+
- python: "3.2"
10+
env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
11+
- python: "3.2"
12+
env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
13+
14+
- python: "3.3"
15+
env: DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
16+
- python: "3.3"
17+
env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
18+
- python: "3.3"
19+
env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
20+
21+
- python: "3.5"
22+
env: DJANGO=">=1.7,<1.8" DRF=">=3.1,<3.2"
23+
- python: "3.5"
24+
env: DJANGO=">=1.7,<1.8" DRF=">=3.2,<3.3"
25+
- python: "3.5"
26+
env: DJANGO=">=1.7,<1.8" DRF=">=3.3,<3.4"
27+
python:
28+
- "2.7"
29+
- "3.2"
30+
- "3.3"
31+
- "3.4"
32+
- "3.5"
633
env:
7-
- TOXENV=py27-django17-drf31
8-
- TOXENV=py27-django17-drf32
9-
- TOXENV=py33-django17-drf31
10-
- TOXENV=py33-django17-drf32
11-
- TOXENV=py34-django17-drf31
12-
- TOXENV=py34-django17-drf32
13-
- TOXENV=py27-django18-drf31
14-
- TOXENV=py27-django18-drf32
15-
- TOXENV=py27-django18-drf33
16-
- TOXENV=py27-django18-drf34
17-
- TOXENV=py33-django18-drf31
18-
- TOXENV=py33-django18-drf32
19-
- TOXENV=py33-django18-drf33
20-
- TOXENV=py33-django18-drf34
21-
- TOXENV=py34-django18-drf31
22-
- TOXENV=py34-django18-drf32
23-
- TOXENV=py34-django18-drf33
24-
- TOXENV=py34-django18-drf34
25-
- TOXENV=py27-django19-drf31
26-
- TOXENV=py27-django19-drf32
27-
- TOXENV=py27-django19-drf33
28-
- TOXENV=py27-django19-drf34
29-
- TOXENV=py34-django19-drf31
30-
- TOXENV=py34-django19-drf32
31-
- TOXENV=py34-django19-drf33
32-
- TOXENV=py34-django19-drf34
33-
- TOXENV=py35-django19-drf31
34-
- TOXENV=py35-django19-drf32
35-
- TOXENV=py35-django19-drf33
36-
- TOXENV=py35-django19-drf34
37-
- TOXENV=py27-django110-drf34
38-
- TOXENV=py34-django110-drf34
39-
- TOXENV=py35-django110-drf34
34+
- DJANGO=">=1.7,<1.8" DRF=">=3.1,<3.2"
35+
- DJANGO=">=1.7,<1.8" DRF=">=3.2,<3.3"
36+
- DJANGO=">=1.7,<1.8" DRF=">=3.3,<3.4"
37+
38+
- DJANGO=">=1.8,<1.9" DRF=">=3.1,<3.2"
39+
- DJANGO=">=1.8,<1.9" DRF=">=3.2,<3.3"
40+
- DJANGO=">=1.8,<1.9" DRF=">=3.3,<3.4"
41+
- DJANGO=">=1.8,<1.9" DRF=">=3.4,<3.5"
42+
43+
- DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
44+
- DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
45+
46+
- DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
47+
before_install:
48+
# Force an upgrade of py to avoid VersionConflict
49+
- pip install --upgrade py
50+
- pip install 'coverage<4; python_version == "3.2"' codecov
51+
install:
52+
- pip install Django${DJANGO} djangorestframework${DRF}
53+
- python setup.py install
54+
script:
55+
- coverage run setup.py -v test
56+
after_success:
57+
- codecov

‎example/tests/integration/test_includes.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
from django.core.urlresolvers import reverse
33

44
from example.tests.utils import load_json
5-
import mock
65

7-
pytestmark = pytest.mark.django_db
6+
try:
7+
from unittest import mock
8+
except ImportError:
9+
import mock
810

11+
pytestmark = pytest.mark.django_db
912

1013

1114
@mock.patch('rest_framework_json_api.utils.get_default_included_resources_from_serializer', new=lambda s: ['comments'])

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /