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 b9de139

Browse files
Update compatibility matrix for Python, Django, and DRF (#341)
* Add specificity to the version support in the documentation. * Test DJA against Django 1.11. * Add Django 1.11 to CHANGELOG. * Test DRF 3.5 and Python 3.6. * Test against DRF 3.6.
1 parent 0477024 commit b9de139

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ pip-delete-this-directory.txt
3737

3838
# VirtualEnv
3939
.venv/
40+
41+
*.sw*

‎.travis.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@ matrix:
1010
env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
1111
- python: "3.3"
1212
env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
13+
- python: "3.3"
14+
env: DJANGO=">=1.11,<1.12" DRF=">=3.4,<3.5"
15+
- python: "3.3"
16+
env: DJANGO=">=1.11,<1.12" DRF=">=3.5,<3.6"
17+
- python: "3.3"
18+
env: DJANGO=">=1.11,<1.12" DRF=">=3.6,<3.7"
1319
python:
1420
- "2.7"
1521
- "3.3"
1622
- "3.4"
1723
- "3.5"
24+
- "3.6"
1825
env:
1926
- DJANGO=">=1.8,<1.9" DRF=">=3.1,<3.2"
2027
- DJANGO=">=1.8,<1.9" DRF=">=3.2,<3.3"
@@ -25,6 +32,10 @@ env:
2532
- DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
2633

2734
- DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
35+
36+
- DJANGO=">=1.11,<1.12" DRF=">=3.4,<3.5"
37+
- DJANGO=">=1.11,<1.12" DRF=">=3.5,<3.6"
38+
- DJANGO=">=1.11,<1.12" DRF=">=3.6,<3.7"
2839
before_install:
2940
# Force an upgrade of py & pytest to avoid VersionConflict
3041
- pip install --upgrade py

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v2.2.0
2+
3+
* Add support for Django REST Framework 3.5 and 3.6
4+
* Add support for Django 1.11
5+
* Add support for Python 3.6
16

27
v2.1.1
38

‎README.rst‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ JSON API and Django Rest Framework
1818
:target: https://gitter.im/django-json-api/django-rest-framework-json-api
1919

2020

21-
Documentation: http://django-rest-framework-json-api.readthedocs.org/
21+
--------
22+
Overview
23+
--------
2224

23-
Live demo (resets every hour): http://json-api.jerel.co/
25+
**JSON API support for Django REST Framework**
2426

25-
Format specification: http://jsonapi.org/format/
27+
* Documentation: http://django-rest-framework-json-api.readthedocs.org/
28+
* Live demo (resets every hour): http://json-api.jerel.co/
29+
* Format specification: http://jsonapi.org/format/
2630

2731

2832
By default, Django REST Framework will produce a response like::
@@ -68,8 +72,9 @@ like the following::
6872
Requirements
6973
------------
7074

71-
1. Django
72-
2. Django REST Framework
75+
1. Python (2.7, 3.3, 3.4, 3.5, 3.6)
76+
2. Django (1.8, 1.9, 1.10, 1.11)
77+
3. Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
7378

7479
------------
7580
Installation

‎docs/getting-started.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ like the following:
5151

5252
## Requirements
5353

54-
1. Python >= 2.7
55-
2. Django
56-
3. Django REST Framework >= 3.1
54+
1. Python (2.7, 3.3, 3.4, 3.5, 3.6)
55+
2. Django (1.8, 1.9, 1.10, 1.11)
56+
3. Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
5757

5858
## Installation
5959

6060
From PyPI
6161

62-
pip install djangorestframework-jsonapi==2.0.0-beta.1
62+
pip install djangorestframework-jsonapi
6363

6464
From Source
6565

‎setup.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_package_data(package):
7272
version=get_version('rest_framework_json_api'),
7373
url='https://github.com/django-json-api/django-rest-framework-json-api',
7474
license='MIT',
75-
description='A Django REST framework API adapter for the json-api spec.',
75+
description='A Django REST framework API adapter for the JSON API spec.',
7676
long_description=read('README.rst'),
7777
author='Jerel Unruh',
7878
author_email='',
@@ -92,6 +92,7 @@ def get_package_data(package):
9292
'Programming Language :: Python :: 3.3',
9393
'Programming Language :: Python :: 3.4',
9494
'Programming Language :: Python :: 3.5',
95+
'Programming Language :: Python :: 3.6',
9596
'Topic :: Internet :: WWW/HTTP',
9697
'Topic :: Software Development :: Libraries :: Application Frameworks',
9798
'Topic :: Software Development :: Libraries :: Python Modules',

0 commit comments

Comments
(0)

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