grnspace · ryanluker · Mar 31, 2023 · Oct 6, 2020 · Oct 10, 2020 · Oct 16, 2020
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{Makefile,setup.cfg}]
+indent_style = tab
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository == 'jazzband/django-oauth-toolkit'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U setuptools twine wheel
+
+      - name: Build package
+        run: |
+          python setup.py --version
+          python setup.py sdist --format=gztar bdist_wheel
+          twine check dist/*
+
+      - name: Upload packages to Jazzband
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: jazzband
+          password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
+          repository_url: https://jazzband.co/projects/django-oauth-toolkit/upload
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,49 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 5
+      matrix:
+        python-version: ['3.9']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+
+    - name: Cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key:
+          ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/tox.ini') }}
+        restore-keys: |
+          ${{ matrix.python-version }}-v1-
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade tox tox-gh-actions
+
+    - name: Tox tests
+      run: |
+        tox -v
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@v1
+      with:
+        name: Python ${{ matrix.python-version }}
diff --git a/.gitignore b/.gitignore
@@ -25,8 +25,10 @@ __pycache__
 pip-log.txt
 
 # Unit test / coverage reports
+.cache
 .pytest_cache
 .coverage
+coverage.xml
 .tox
 .pytest_cache/
 nosetests.xml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,27 @@
+repos:
+  - repo: https://github.com/ambv/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: check-ast
+      - id: trailing-whitespace
+      - id: check-merge-conflict
+      - id: check-json
+      - id: check-xml
+      - id: check-yaml
+      - id: mixed-line-ending
+        args: ['--fix=lf']
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.6.3
+    hooks:
+      - id: isort
+        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.4
+    hooks:
+      - id: flake8
+        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS b/AUTHORS
@@ -8,26 +8,43 @@ Contributors
 ============
 
 Abhishek Patel
-Alessandro De Angelis
 Alan Crosswell
+Aleksander Vaskevich
+Alessandro De Angelis
+Allisson Azevedo
 Anvesh Agarwal
-Asif Saif Uddin
-Ash Christopher
 Aristóbulo Meneses
+Aryan Iyappan
+Ash Christopher
+Asif Saif Uddin
 Bart Merenda
 Bas van Oostveen
+Dave Burkholder
 David Fischer
+David Smith
 Diego Garcia
+Dulmandakh Sukhbaatar
+Dylan Giesler
 Emanuele Palazzetti
 Federico Dolce
+Frederico Vieira
 Hiroki Kiyohara
 Jens Timmerman
 Jerome Leclanche
 Jim Graham
+Jonathan Steffan
+Jun Zhou
+Kristian Rune Larsen
 Paul Oswald
-pySilver
+Pavel Tvrdík
 Rodney Richardson
+Rustem Saiargaliev
+Sandro Rodrigues
+Shaun Stanworth
 Silvano Cerza
+Spencer Carroll
 Stéphane Raimbault
-Jun Zhou
-David Smith
+Tom Evans
+Will Beaufoy
+pySilver
+Łukasz Skarżyński
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<!-- 
+<!--
 ## [unreleased]
 ### Added
 ### Changed
@@ -14,14 +14,53 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
   -->
 
-## [unreleased] 
+## [1.5.0] 2021-03-18
 
-### added
+### Added
+* #915 Add optional OpenID Connect support.
+
+### Changed
+* #942 Help via defunct Google group replaced with using GitHub issues
+
+## [1.4.1] 2021-03-12
+
+### Changed
+* #925 OAuth2TokenMiddleware converted to new style middleware, and no longer extends MiddlewareMixin.
+
+### Removed
+* #936 Remove support for Python 3.5
+
+## [1.4.0] 2021-02-08
+
+### Added
+* #917 Documentation improvement for Access Token expiration.
+* #916 (for DOT contributors) Added `tox -e livedocs` which launches a local web server on `locahost:8000`
+  to display Sphinx documentation with live updates as you edit.
+* #891 (for DOT contributors) Added [details](https://django-oauth-toolkit.readthedocs.io/en/latest/contributing.html)
+  on how best to contribute to this project.
+* #884 Added support for Python 3.9
+* #898 Added the ability to customize classes for django admin
+* #690 Added pt-PT translations to HTML templates. This enables adding additional translations.
+
+### Fixed
+* #906 Made token revocation not apply a limit to the `select_for_update` statement (impacts Oracle 12c database).
+* #903 Disable `redirect_uri` field length limit for `AbstractGrant`
+
+## [1.3.3] 2020-10-16
+
+### Added
 * added `select_related` in intospect view for better query performance
+* #831 Authorization token creation now can receive an expire date
+* #831 Added a method to override Grant creation
+* #825 Bump oauthlib to 3.1.0 to introduce PKCE
+* Support for Django 3.1
 
 ### Fixed
 * #847: Fix inappropriate message when response from authentication server is not OK.
 
+### Changed
+* few smaller improvements to remove older django version compatibility #830, #861, #862, #863
+
 ## [1.3.2] 2020-03-24
 
 ### Fixed

diff --git a/README.rst b/README.rst
@@ -7,17 +7,16 @@ Django OAuth Toolkit
 
 *OAuth2 goodies for the Djangonauts!*
 
-.. image:: https://badge.fury.io/py/django-oauth-toolkit.png
+.. image:: https://badge.fury.io/py/django-oauth-toolkit.svg
     :target: http://badge.fury.io/py/django-oauth-toolkit
 
-.. image:: https://travis-ci.org/jazzband/django-oauth-toolkit.png
-   :alt: Build Status
-   :target: https://travis-ci.org/jazzband/django-oauth-toolkit
-
-.. image:: https://coveralls.io/repos/github/jazzband/django-oauth-toolkit/badge.svg?branch=master
-   :alt: Coverage Status
-   :target: https://coveralls.io/github/jazzband/django-oauth-toolkit?branch=master
+.. image:: https://github.com/jazzband/django-oauth-toolkit/workflows/Test/badge.svg
+   :target: https://github.com/jazzband/django-oauth-toolkit/actions
+   :alt: GitHub Actions
 
+.. image:: https://codecov.io/gh/jazzband/django-oauth-toolkit/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/jazzband/django-oauth-toolkit
+   :alt: Coverage
 
 If you are facing one or more of the following:
  * Your Django app exposes a web API you want to protect with OAuth2 authentication,
@@ -42,7 +41,7 @@ Please report any security issues to the JazzBand security team at <security@jaz
 Requirements
 ------------
 
-* Python 3.5+
+* Python 3.6+
 * Django 2.1+
 * oauthlib 3.1+
 
@@ -89,16 +88,27 @@ Developer Setup
 ---------------
 
 To get started with running or building the module you will need to install a virtual environment::
-
-    python36 -m venv ~/venv/python36-django-oauth-toolkit
-    source ~/venv/python36-django-oauth-toolkit
+```
+    python39 -m venv ~/venv/python39-django-oauth-toolkit
+    source ~/venv/python39-django-oauth-toolkit
+```
+or
+```
+    pyenv install 3.9.16
+    pyenv virtualenv 3.9.16-toolkit
+    pyenv activate 3.9.16-toolkit
+```
+then
+```
     python setup.py install
     python setup.py build
+```
 
 To run the tox tests for our specifically supported build use the following::
-
+```
     pip install tox
-    tox -e py36-django22
+    tox -e py39-django32
+```
 
 License
 -------

diff --git a/docs/Makefile b/docs/Makefile
@@ -175,3 +175,6 @@ pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+livehtml:
+	sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)