Skip to content

Commit e127351

Browse files
eadwinCodePijulibertonhaAndrew-Chen-Wangvainu-arto
authored
July 16 jazzband merge (#12)
* Fix ES locale translation error (jazzband#499) * chore: test on Django 4.0 (jazzband#495) * chore: test on Django 4.0 * Remove Django 3.1 support from trove * Remove Django 3.1 from tox * Remove 3.1 reference in tox.ini Co-authored-by: Andrew Chen Wang <[email protected]> * Stop deleting blacklist on user delete (jazzband#516) * OutstandingToken user on_delete should be null * Add test to verify that deleting a User doesn't remove tokens from the blacklist This is a rather unexpected default behavior. Deleting a User means that their blacklisted tokens become live again. * Add migration for cascading User deletion to SET_NULL instead of DELETE * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: Andrew Chen Wang <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (jazzband#498) updates: - [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](pre-commit/pre-commit-hooks@v4.0.1...v4.1.0) - [github.com/asottile/yesqa: v1.2.3 → v1.3.0](asottile/yesqa@v1.2.3...v1.3.0) - [github.com/pycqa/isort: 5.9.3 → 5.10.1](PyCQA/isort@5.9.3...5.10.1) - [github.com/psf/black: 21.9b0 → 21.12b0](psf/black@21.9b0...21.12b0) - [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](pre-commit/pre-commit-hooks@v4.0.1...v4.1.0) - [github.com/asottile/pyupgrade: v2.28.0 → v2.31.0](asottile/pyupgrade@v2.28.0...v2.31.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Enable ECDSA algorithms supported by PyJWT (jazzband#520) * Parameterize some tests to reduce duplication and make it easy to add more algorithms This way new algorithms can be added to the basic test set simply by adding their backends to TestTokenBackend.backends. * Enable ECDSA algorithms supported by PyJWT Enable the algorithms and add basic tests for them. Also convert the ALLOWED_ALGORITHMS constant to a set for a minor style cleanup. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Simplify using custom token classes in serializers (jazzband#517) For most cases this could be done by overriding get_token, which is simple enough. The exception was TokenRefreshSerializer.validate where the entire method needed to be copy-pasted to allow using a custom replacement for RefreshToken. The other cases are changed the same way mainly for consistency. * [pre-commit.ci] pre-commit autoupdate (jazzband#524) updates: - [github.com/psf/black: 21.12b0 → 22.1.0](psf/black@21.12b0...22.1.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Make the token serializer configurable (jazzband#521) * Update translation files (jazzband#526) * Add default __getattr__ behavior to models.TokenUser (jazzband#528) * Add default __getattr__ behavior to models.TokenUser to allow getting custom claims defined in serializers * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Allow overriding access token class (jazzband#529) * Maintain compatibility with serializer_class overrides (jazzband#530) * Consider leeway when checking expiry (jazzband#458) * Add locale checker to CI (jazzband#456) * Add locale checker to CI * Just pip install Django * Add gettext package to OS * Add sudo to apt-get * Use @2ykwang 's updated script * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Only update on push to master * To avoid pain points of PRs and histories being split * Trying to use Andrew's username for pushing to see if that works * Use separate workflow file Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Update CHANGELOG.md for v5.1.0 (jazzband#527) * Update CHANGELOG.md for v5.0.1 * Update CHANGELOG.md * Remove looking for maintainers in README since Jazzband Co-authored-by: Andrew Chen Wang <[email protected]> * Fix i18n CI (jazzband#538) * Open PR on i18n (jazzband#539) * fix small typo (jazzband#540) * Setup initial PyJWT 1.7.1 support (jazzband#536) * Fix release locale checker (jazzband#541) * Update locale files (jazzband#542) * [pre-commit.ci] pre-commit autoupdate (jazzband#545) updates: - [github.com/asottile/pyupgrade: v2.31.0 → v2.31.1](asottile/pyupgrade@v2.31.0...v2.31.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Remove the JWTTokenUserAuthentication from the Experimental Features jazzband#546 (jazzband#547) * Change from git protocol to https protocol (jazzband#555) * [pre-commit.ci] pre-commit autoupdate (jazzband#551) updates: - [github.com/psf/black: 22.1.0 → 22.3.0](psf/black@22.1.0...22.3.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Fix leeway type error (jazzband#554) * Fix lewway type error * Add test case * Update Korean translation * Add type hints * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix translation revert POT-Creation-Date * update translation Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (jazzband#557) * Add info on TokenBlacklistView to the docs (jazzband#558) * chore(ci): add informational Codecov status checks (jazzband#559) * Update JWTStatelessUserAuthentication docs (jazzband#561) * Allow none jti claim token type claim (jazzband#567) * Allow customizing token JSON encoding (jazzband#568) * Allow specifying custom JSONEncoder for TokenBackend * Make TokenBackend JSONEncoder configurable * [pre-commit.ci] pre-commit autoupdate (jazzband#571) updates: - [github.com/asottile/pyupgrade: v2.32.0 → v2.32.1](asottile/pyupgrade@v2.32.0...v2.32.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Update CHANGELOG to 5.2.0 (jazzband#573) * Locale update (jazzband#574) * update & correct supported versions in docs (jazzband#576) * update & correct supported versions in docs * Add DRF supported version Co-authored-by: Andrew Chen Wang <[email protected]> * Add Swedish translations (jazzband#579) * Fixed issue jazzband#543 (jazzband#586) * Allow optional installation of the 'cryptography' package (jazzband#543) * Update docs (jazzband#543) * Update docs (jazzband#543) * Update docs/getting_started.rst Co-authored-by: Andrew Chen Wang <[email protected]> * fix for code-block (jazzband#543) * another fix for code-block (jazzband#543) * fix: removed extra line (jazzband#543) Co-authored-by: Andrew Chen Wang <[email protected]> * [pre-commit.ci] pre-commit autoupdate (jazzband#587) updates: - [github.com/pre-commit/pre-commit-hooks: v4.2.0 → v4.3.0](pre-commit/pre-commit-hooks@v4.2.0...v4.3.0) - [github.com/pre-commit/pre-commit-hooks: v4.2.0 → v4.3.0](pre-commit/pre-commit-hooks@v4.2.0...v4.3.0) - [github.com/asottile/pyupgrade: v2.32.1 → v2.34.0](asottile/pyupgrade@v2.32.1...v2.34.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (jazzband#589) updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (jazzband#590) * removed some unwanted files * removed some unwanted files * code lint Co-authored-by: Marc Salat <[email protected]> Co-authored-by: Christofer Bertonha <[email protected]> Co-authored-by: Andrew Chen Wang <[email protected]> Co-authored-by: vainu-arto <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: yeongkwang <[email protected]> Co-authored-by: Oscar Y Chen <[email protected]> Co-authored-by: totycro <[email protected]> Co-authored-by: Byron Motoche <[email protected]> Co-authored-by: Vladimir <[email protected]> Co-authored-by: Tom Hu <[email protected]> Co-authored-by: Dennis Dinwiddie <[email protected]> Co-authored-by: abdurrahman <[email protected]> Co-authored-by: Pasindu Prabhashitha <[email protected]> Co-authored-by: Armenak Baburyan <[email protected]>
1 parent 9844d12 commit e127351

File tree

101 files changed

+1478
-1218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1478
-1218
lines changed

.github/workflows/i18n.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# not in use yet

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# not used

.pre-commit-config.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: 'v4.3.0'
4+
hooks:
5+
- id: check-merge-conflict
6+
- repo: https://github.com/asottile/yesqa
7+
rev: v1.3.0
8+
hooks:
9+
- id: yesqa
10+
- repo: https://github.com/pycqa/isort
11+
rev: '5.10.1'
12+
hooks:
13+
- id: isort
14+
args: ["--profile", "black"]
15+
- repo: https://github.com/psf/black
16+
rev: '22.6.0'
17+
hooks:
18+
- id: black
19+
language_version: python3 # Should be a command that runs python3.6+
20+
- repo: https://github.com/pre-commit/pre-commit-hooks
21+
rev: 'v4.3.0'
22+
hooks:
23+
- id: end-of-file-fixer
24+
exclude: >-
25+
^docs/[^/]*\.svg$
26+
- id: requirements-txt-fixer
27+
- id: trailing-whitespace
28+
types: [python]
29+
- id: file-contents-sorter
30+
files: |
31+
CONTRIBUTORS.txt|
32+
docs/spelling_wordlist.txt|
33+
.gitignore|
34+
.gitattributes
35+
- id: check-case-conflict
36+
- id: check-json
37+
- id: check-xml
38+
- id: check-executables-have-shebangs
39+
- id: check-toml
40+
- id: check-xml
41+
- id: check-yaml
42+
- id: debug-statements
43+
- id: check-added-large-files
44+
- id: check-symlinks
45+
- id: debug-statements
46+
- id: detect-aws-credentials
47+
args: ['--allow-missing-credentials']
48+
- id: detect-private-key
49+
exclude: ^tests/
50+
- repo: https://github.com/asottile/pyupgrade
51+
rev: 'v2.37.1'
52+
hooks:
53+
- id: pyupgrade
54+
args: ['--py37-plus', '--keep-mock']
55+
56+
- repo: https://github.com/Lucas-C/pre-commit-hooks-markup
57+
rev: v1.0.1
58+
hooks:
59+
- id: rst-linter
60+
files: >-
61+
^[^/]+[.]rst$

CHANGELOG.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
## Unreleased
22

3+
## Version 5.2.0
4+
5+
* Remove the JWTTokenUserAuthentication from the Experimental Features #546 by @byrpatrick in https://github.com/jazzband/djangorestframework-simplejwt/pull/547
6+
* Fix leeway type error by @2ykwang in https://github.com/jazzband/djangorestframework-simplejwt/pull/554
7+
* Add info on TokenBlacklistView to the docs by @inti7ary in https://github.com/jazzband/djangorestframework-simplejwt/pull/558
8+
* Update JWTStatelessUserAuthentication docs by @2ykwang in https://github.com/jazzband/djangorestframework-simplejwt/pull/561
9+
* Allow none jti claim token type claim by @denniskeends in https://github.com/jazzband/djangorestframework-simplejwt/pull/567
10+
* Allow customizing token JSON encoding by @vainu-arto in https://github.com/jazzband/djangorestframework-simplejwt/pull/568
11+
12+
## Version 5.1.0
13+
14+
* Add back support for PyJWT 1.7.1 ([#536](https://github.com/jazzband/djangorestframework-simplejwt/pull/536))
15+
* Make the token serializer configurable ([#521](https://github.com/jazzband/djangorestframework-simplejwt/pull/521))
16+
* Simplify using custom token classes in serializers ([#517](https://github.com/jazzband/djangorestframework-simplejwt/pull/517))
17+
* Fix default_app_config deprecation ([#415](https://github.com/jazzband/djangorestframework-simplejwt/pull/415))
18+
* Add missing integration instructions for drf-yasg ([#505](https://github.com/jazzband/djangorestframework-simplejwt/pull/505))
19+
* Add blacklist view to log out users ([#306](https://github.com/jazzband/djangorestframework-simplejwt/pull/306))
20+
* Set default verifying key to empty str ([#487](https://github.com/jazzband/djangorestframework-simplejwt/pull/487))
21+
* Add docs about TOKEN_USER_CLASS ([#455](https://github.com/jazzband/djangorestframework-simplejwt/pull/440))
22+
23+
Meta:
24+
* Add auto locale updater ([#456](https://github.com/jazzband/djangorestframework-simplejwt/pull/456))
25+
26+
Translations:
27+
28+
* Added Korean translations ([#501](https://github.com/jazzband/djangorestframework-simplejwt/pull/501))
29+
* Added Turkish translations ([#508](https://github.com/jazzband/djangorestframework-simplejwt/pull/508))
30+
331
## Version 5.0.0
432

533
#### Breaking
@@ -12,8 +40,7 @@
1240
* Updated import list ([#459](https://github.com/jazzband/djangorestframework-simplejwt/pull/459))
1341
* Repair generation of OpenAPI with Spectacular ([#452](https://github.com/jazzband/djangorestframework-simplejwt/pull/452))
1442
* Add "iat" claim to token ([#192](https://github.com/jazzband/djangorestframework-simplejwt/pull/192))
15-
* Add blacklist view to log out users ([#306](https://github.com/jazzband/djangorestframework-simplejwt/pull/306))
16-
* updated import list in docs ([#459](https://github.com/jazzband/djangorestframework-simplejwt/pull/459))
43+
* Add blacklist view to log out users ([#306](https://github.com/jazzband/djangorestframework-simplejwt/pull/306))
1744

1845
## Version 4.8.0
1946

@@ -36,6 +63,7 @@
3663
* Fix invalid syntax in docs for `INSTALLED_APPS` ([#416](https://github.com/jazzband/django-rest-framework-simplejwt/pull/416))
3764

3865
Translations:
66+
3967
* Added Dutch translations ([#422](https://github.com/jazzband/django-rest-framework-simplejwt/pull/422))
4068
* Added Ukrainian translations ([#423](https://github.com/jazzband/django-rest-framework-simplejwt/pull/423))
4169
* Added Simplified Chinese translations ([#427](https://github.com/jazzband/django-rest-framework-simplejwt/pull/427))

codecov.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
coverage:
22
status:
3-
project: false
4-
patch: false
3+
project:
4+
default:
5+
informational: true
6+
patch:
7+
default:
8+
informational: true
59
changes: false
610

711
comment: off

docs/docs/blacklist_app.rst

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

docs/docs/creating_tokens_manually.rst

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

docs/docs/customizing_token_claims.rst

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

docs/docs/development_and_contributing.rst

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

docs/docs/drf_yasg_integration.rst

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

0 commit comments

Comments
 (0)