Merge remote-tracking branch 'origin/master' into impersonation

# Conflicts:
#	demo/app/admin.py
#	demo/app/migrations/0001_initial.py
#	demo/app/models.py
#	demo/app/urls.py
#	demo/demo/urls.py
#	demo/demo/wsgi.py
#	demo/manage.py
#	setup.cfg
#	tests/test_views.py

Author: Nikolina Krizanec

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.13.3
+current_version = 1.13.4
 commit = True
 tag = True
 tag_name = {new_version}

.gitignore

@@ -2,9 +2,6 @@
 !.gitignore
 !.travis.yml
 
-# The migrations are built each time
-tests/migrations/
-
 # Temporary, DB binary files
 *~
 *.db
@@ -76,6 +73,7 @@ coverage.xml
 
 # Django stuff:
 *.log
+demo/settings/dev-*.py
 
 # Sphinx documentation
 docs/_build/
@@ -107,3 +105,6 @@ python_boilerplate/
 # Sqlite3
 *.sqlite3
 
+# virtual environment stuff
+venv/
+.python-version

.travis.yml

@@ -7,6 +7,7 @@ python:
   - 3.5
   - 3.6
   - 3.7
+  - 3.8
 install:
   - pip install tox-travis
 script:
@@ -16,6 +17,9 @@ jobs:
     - stage: test
       python: '2.7.13'
       env: TOXENV=docs
+    - stage: test
+      python: '3.7'
+      env: TOXENV=manifest
     - stage: deploy
       python: '2.7.13'
       env: TOXENV=py27-dj111-drf37

CHANGELOG.md

@@ -13,6 +13,20 @@ time.
 
 .. towncrier release notes start
 
+1.13.4 (2019-12-13)
+====================
+
+Bugfixes
+--------
+
+- Remove serialization on response data in `BaseJSONWebTokenAPIView` because it 
+  breaks custom response payload handlers which add extra data to the response 
+  payload. This change aligns this fork more closely with the original and makes 
+  it easier to use this fork as a drop-in replacement for the original. Also 
+  change the ReponsePayload from a `namedtuple` to a dictionary because 
+  `namedtuple` is not JSON serializable ([#22](https://github.com/Styria-Digital/django-rest-framework-jwt/pull/22))
+
+
 1.13.3 (2019-10-17)
 ====================
 

CONTRIBUTING.md

@@ -24,6 +24,16 @@ If it is not installed, type:
 $ pip install tox
 ```
 
+### Using the demo project
+
+You can use the `demo` project as you would any other Django project by running `$ tox -e serve`.
+This creates a separate `tox` environment and executes the `runserver` command using the development settings.
+If you want to pass additional arguments, e.g. your custom settings, use the following syntax:
+
+```bash
+$ tox -e serve -- --settings=demo.settings.dev-custom
+```
+
 ## Testing
 
 To run the test suite against current virtual environment run the `pytest` while adding the `src` directory to `PYTHONPATH`:
@@ -85,10 +95,10 @@ The documentation should be available in `/html/index.html`.
 
 The CI environment should build packages and upload them to the PyPI server
 when a tag is pushed to `origin`. Therefore, if you want to make a new release,
-all you have to do is execute the `make-release` environment in `tox`:
+all you have to do is execute the `release` environment in `tox`:
 
 ```bash
-$ tox -e make-release
+$ tox -e release
 ```
 
 This environment will merge the changelogs from the `changelog.d` directory
@@ -99,7 +109,7 @@ changes, create a tag and push the changes and the tags to `origin`.
 If you want to make a **patch** release, type:
 
 ```bash
-$ tox -e make-release -- patch
+$ tox -e release -- patch
 ```
 
 If Travis CI builds were successful release should be automatically uploaded to PyPI.org.

MANIFEST.in

@@ -0,0 +1,12 @@
+include LICENSE MANIFEST.in *.md *.rst *.toml *.yml *.ini *.cfg
+
+recursive-include docs *
+recursive-include src/rest_framework_jwt *
+recursive-include tests *
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+recursive-exclude html *
+
+prune demo
+prune changelog.d

README.md

@@ -7,7 +7,7 @@ JSON Web Token Authentication support for Django REST Framework
 
 ## Overview
 
-This package provides [JSON Web Token Authentication][jwt-auth-spec] support 
+This package provides [JSON Web Token Authentication][jwt-auth-spec] support
 for [Django REST framework][drf].
 
 If you want to know more about JWT, check out the following resources:
@@ -18,8 +18,8 @@ If you want to know more about JWT, check out the following resources:
 
 ## Requirements
 
--  Python 2.7, 3.4, 3.5, 3.6
--  Django 1.11, 2.0, 2.1, 2.2
+-  Python 2.7, 3.4+
+-  Django 1.11+
 -  Django REST Framework 3.7+
 
 ## Installation

changelog.d/23.doc.md

@@ -0,0 +1 @@
+Document compatibility with Python 3.7.

changelog.d/24.doc.md

@@ -0,0 +1 @@
+Add support for Django 3.0, Python 3.8 and `djangorestframework` 3.11

changelog.d/24.misc.md

@@ -0,0 +1,2 @@
+* Run the test suite against the `demo` project. The same project can be used for local development as well.
+* Add the `serve` environment to `tox` that starts the `demo` project's development server. To use it, run: `$ tox -e serve`