Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,16 @@ language: python

matrix:
include:
- python: 2.7
env:
- TOX_ENV=py27-django1.11-drf3.8
- python: 3.7
dist: xenial
sudo: true
env:
- TOX_ENV=py37-django1.11-drf3.8
- python: 3.7
dist: xenial
sudo: true
env:
- TOX_ENV=py37-django2.1-drf3.8
- TOX_ENV=py37-django3.0-drf3.11
- python: 3.7
dist: xenial
sudo: true
env:
- TOX_ENV=coveralls
- TOX_ENV=py37-django2.2-drf3.11
fast_finish: true

install:
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,13 @@ permissions against the request, and scrubs from the return any fields which fai
Compatibility
-------------

* Django Rest Framework 3.8
* Django 1.11, 2.1
* Python 2.7, 3.7
This package is tested for compatibility against the following software versions:

See tox.ini for specific minor versions tested.
* Django Rest Framework 3.11
* Django 2.1, 3.0
* Python 3.7

This package may incidentally be compatible with other similar versions of the above software. See tox.ini for specific minor versions tested.

Additional Requirements
-----------------------
Expand Down
10 changes: 4 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='django-rest-serializer-field-permissions',
version='1.0.0',
version='1.0.1',
packages=['rest_framework_serializer_field_permissions'],
include_package_data=True,
license='GNU General Public License v3 (GPLv3)',
Expand All @@ -19,8 +19,8 @@
author='The Intersis Foundation',
author_email='dev@intersis.org',
install_requires=[
'django>=1.6',
'djangorestframework>=3.0.0, <=3.8',
'django>=2.1',
'djangorestframework~=3.0',
],
classifiers=[
'Development Status :: 3 - Alpha',
Expand All @@ -30,9 +30,7 @@
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist =
{py27}-django{1.11}-drf{3.8},
{py37}-django{1.11,2.1}-drf{3.8},
{py37}-django{2.2,3.0}-drf{3.11},
lint,
coveralls

Expand Down Expand Up @@ -29,6 +28,6 @@ commands =
commands = python rest_framework_serializer_field_permissions/tests/runtests.py

deps =
django1.11: Django==1.11.15
django2.1: Django==2.1.1
drf3.8: djangorestframework==3.8.2
django3.0: Django==3.0.7
django2.2: Django==2.2.9
drf3.11: djangorestframework==3.11.0