Skip to content

Commit c939613

Browse files
abdulhaq-eabdulhaq-e
committed
Remove support Python 2
Move to Circle CI Travis is good Disable tests for the time being enable some tests Refactor tests.
1 parent 2adaeed commit c939613

39 files changed

+1412
-1754
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,10 @@
22
language: python
33
sudo: false
44
cache: pip
5-
matrix:
6-
exclude:
7-
- python: "3.3"
8-
env: DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
9-
- python: "3.3"
10-
env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
11-
- python: "3.3"
12-
env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
135
python:
14-
- "2.7"
15-
- "3.3"
16-
- "3.4"
176
- "3.5"
18-
env:
19-
- DJANGO=">=1.8,<1.9" DRF=">=3.1,<3.2"
20-
- DJANGO=">=1.8,<1.9" DRF=">=3.2,<3.3"
21-
- DJANGO=">=1.8,<1.9" DRF=">=3.3,<3.4"
22-
- DJANGO=">=1.8,<1.9" DRF=">=3.4,<3.5"
23-
24-
- DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
25-
- DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
26-
27-
- DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
28-
before_install:
29-
# Force an upgrade of py & pytest to avoid VersionConflict
30-
- pip install --upgrade py
31-
- pip install "pytest>=2.8,<3"
32-
- pip install codecov
7+
- "3.6"
338
install:
34-
- pip install Django${DJANGO} djangorestframework${DRF}
35-
- python setup.py install
9+
- pip install -r requirements-development.txt
3610
script:
37-
- coverage run setup.py -v test
38-
after_success:
39-
- codecov
11+
- tox

‎Pipfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
5+
[dev-packages]
6+
pytest = "*"
7+
pytest-django = "*"
8+
pytest-factoryboy = "*"
9+
faker = "*"
10+
django-filter = "*"
11+
12+
[packages]
13+
django = "*"

‎README.rst‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,7 @@
22
JSON API and Django Rest Framework
33
====================================
44

5-
.. image:: https://travis-ci.org/django-json-api/django-rest-framework-json-api.svg?branch=develop
6-
:target: https://travis-ci.org/django-json-api/django-rest-framework-json-api
7-
8-
.. image:: https://readthedocs.org/projects/django-rest-framework-json-api/badge/?version=latest
9-
:alt: Read the docs
10-
:target: http://django-rest-framework-json-api.readthedocs.org/
11-
12-
.. image:: https://codeclimate.com/github/django-json-api/django-rest-framework-json-api/badges/gpa.svg
13-
:target: https://codeclimate.com/github/django-json-api/django-rest-framework-json-api
14-
:alt: Code Climate
15-
16-
.. image:: https://badges.gitter.im/Join%20Chat.svg
17-
:alt: Join the chat at https://gitter.im/django-json-api/django-rest-framework-json-api
18-
:target: https://gitter.im/django-json-api/django-rest-framework-json-api
19-
5+
Upstream version
206

217
Documentation: http://django-rest-framework-json-api.readthedocs.org/
228

‎circle.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
machine:
2+
python:
3+
version: 3.6.0
4+
5+
6+
machine:
7+
post:
8+
- pyenv global 3.5.2 3.6.0
9+
10+
dependencies:
11+
override:
12+
- pip install -r requirements-development.txt
13+
- pyenv local 3.5.2 3.6.0
14+
15+
test:
16+
override:
17+
- tox

‎example/api/resources/identity.py‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎example/api/serializers/identity.py‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎example/filters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ class CommentFilter(django_filters.FilterSet):
77

88
class Meta:
99
model = Comment
10-
fileds = {'body': ['exact', 'in', 'icontains', 'contains'],
10+
fields = {'body': ['exact', 'in', 'icontains', 'contains'],
1111
'author': ['exact', 'gte', 'lte'],
1212
}

0 commit comments

Comments
 (0)