Skip to content

Commit 056b708

Browse files
committed
chore: update from jazzband to django-oauth
1 parent 52b0b2f commit 056b708

13 files changed

+163
-115
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
if: github.repository == 'jazzband/django-oauth-toolkit'
10+
if: github.repository == 'django-oauth/django-oauth-toolkit'
1111
runs-on: ubuntu-latest
1212

1313
steps:
@@ -29,10 +29,9 @@ jobs:
2929
python -m build
3030
twine check dist/*
3131
32-
- name: Upload packages to Jazzband
32+
- name: Upload packages to PyPI
3333
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
34-
uses: pypa/gh-action-pypi-publish@master
34+
uses: pypa/gh-action-pypi-publish@release/v1
3535
with:
36-
user: jazzband
37-
password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
38-
repository_url: https://jazzband.co/projects/django-oauth-toolkit/upload
36+
user: __token__
37+
password: ${{ secrets.PYPI_PUBLISH_TOKEN }}

CHANGELOG.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
* #1506 Support for Wildcard Origin and Redirect URIs
1111
* #1586 Turkish language support added
1212

13-
<!--
1413
### Changed
14+
The project is now hosted in the django-oauth organization.
15+
16+
<!--
1517
### Deprecated
1618
### Removed
1719
-->
@@ -241,7 +243,7 @@ This is a major release with **BREAKING** changes. Please make sure to review th
241243
## [1.6.1] 2021-12-23
242244

243245
### Changed
244-
* Note: Only Django 4.0.1+ is supported due to a regression in Django 4.0.0. [Explanation](https://github.com/jazzband/django-oauth-toolkit/pull/1046#issuecomment-998015272)
246+
* Note: Only Django 4.0.1+ is supported due to a regression in Django 4.0.0. [Explanation](https://github.com/django-oauth/django-oauth-toolkit/pull/1046#issuecomment-998015272)
245247

246248
### Fixed
247249
* Miscellaneous 1.6.0 packaging issues.
@@ -332,7 +334,7 @@ This is a major release with **BREAKING** changes. Please make sure to review th
332334

333335
### Fixed
334336
* #812: Reverts #643 pass wrong request object to authenticate function.
335-
* Fix concurrency issue with refresh token requests (#[810](https://github.com/jazzband/django-oauth-toolkit/pull/810))
337+
* Fix concurrency issue with refresh token requests (#[810](https://github.com/django-oauth/django-oauth-toolkit/pull/810))
336338
* #817: Reverts #734 tutorial documentation error.
337339

338340

@@ -371,16 +373,16 @@ This is a major release with **BREAKING** changes. Please make sure to review th
371373

372374
### Fixed
373375
* Fix a race condition in creation of AccessToken with external oauth2 server.
374-
* Fix several concurrency issues. (#[638](https://github.com/jazzband/django-oauth-toolkit/issues/638))
375-
* Fix to pass `request` to `django.contrib.auth.authenticate()` (#[636](https://github.com/jazzband/django-oauth-toolkit/issues/636))
376+
* Fix several concurrency issues. (#[638](https://github.com/django-oauth/django-oauth-toolkit/issues/638))
377+
* Fix to pass `request` to `django.contrib.auth.authenticate()` (#[636](https://github.com/django-oauth/django-oauth-toolkit/issues/636))
376378
* Fix missing `oauth2_error` property exception oauthlib_core.verify_request method raises exceptions in authenticate.
377-
(#[633](https://github.com/jazzband/django-oauth-toolkit/issues/633))
379+
(#[633](https://github.com/django-oauth/django-oauth-toolkit/issues/633))
378380
* Fix "django.db.utils.NotSupportedError: FOR UPDATE cannot be applied to the nullable side of an outer join" for postgresql.
379-
(#[714](https://github.com/jazzband/django-oauth-toolkit/issues/714))
381+
(#[714](https://github.com/django-oauth/django-oauth-toolkit/issues/714))
380382
* Fix to return a new refresh token during grace period rather than the recently-revoked one.
381-
(#[702](https://github.com/jazzband/django-oauth-toolkit/issues/702))
383+
(#[702](https://github.com/django-oauth/django-oauth-toolkit/issues/702))
382384
* Fix a bug in refresh token revocation.
383-
(#[625](https://github.com/jazzband/django-oauth-toolkit/issues/625))
385+
(#[625](https://github.com/django-oauth/django-oauth-toolkit/issues/625))
384386

385387
## 1.2.0 [2018-06-03]
386388

@@ -402,7 +404,7 @@ This is a major release with **BREAKING** changes. Please make sure to review th
402404
* **Critical**: Django OAuth Toolkit 1.1.0 contained a migration that would revoke all existing
403405
RefreshTokens (`0006_auto_20171214_2232`). This release corrects the migration.
404406
If you have already ran it in production, please see the following issue for more details:
405-
https://github.com/jazzband/django-oauth-toolkit/issues/589
407+
https://github.com/django-oauth/django-oauth-toolkit/issues/589
406408

407409

408410
## 1.1.0 [2018-04-13]

CODE_OF_CONDUCT.md

Lines changed: 106 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,108 @@
11
# Code of Conduct
22

3-
As contributors and maintainers of the Jazzband projects, and in the interest of
4-
fostering an open and welcoming community, we pledge to respect all people who
5-
contribute through reporting issues, posting feature requests, updating documentation,
6-
submitting pull requests or patches, and other activities.
7-
8-
We are committed to making participation in the Jazzband a harassment-free experience
9-
for everyone, regardless of the level of experience, gender, gender identity and
10-
expression, sexual orientation, disability, personal appearance, body size, race,
11-
ethnicity, age, religion, or nationality.
12-
13-
Examples of unacceptable behavior by participants include:
14-
15-
- The use of sexualized language or imagery
16-
- Personal attacks
17-
- Trolling or insulting/derogatory comments
18-
- Public or private harassment
19-
- Publishing other's private information, such as physical or electronic addresses,
20-
without explicit permission
21-
- Other unethical or unprofessional conduct
22-
23-
The Jazzband roadies have the right and responsibility to remove, edit, or reject
24-
comments, commits, code, wiki edits, issues, and other contributions that are not
25-
aligned to this Code of Conduct, or to ban temporarily or permanently any contributor
26-
for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
27-
28-
By adopting this Code of Conduct, the roadies commit themselves to fairly and
29-
consistently applying these principles to every aspect of managing the jazzband
30-
projects. Roadies who do not follow or enforce the Code of Conduct may be permanently
31-
removed from the Jazzband roadies.
32-
33-
This code of conduct applies both within project spaces and in public spaces when an
34-
individual is representing the project or its community.
35-
36-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
37-
contacting the roadies at `[email protected]`. All complaints will be reviewed and
38-
investigated and will result in a response that is deemed necessary and appropriate to
39-
the circumstances. Roadies are obligated to maintain confidentiality with regard to the
40-
reporter of an incident.
41-
42-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version
43-
1.3.0, available at [https://contributor-covenant.org/version/1/3/0/][version]
44-
45-
[homepage]: https://contributor-covenant.org
46-
[version]: https://contributor-covenant.org/version/1/3/0/
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Maintainers are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Maintainers have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official email address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Warning
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A warning with consequences for continued behavior. No
80+
interaction with the people involved, including unsolicited interaction with
81+
those enforcing the Code of Conduct, for a specified period of time. This
82+
includes avoiding interactions in community spaces as well as external channels
83+
like social media. Violating these terms may lead to a temporary or permanent
84+
ban.
85+
86+
### 2. Temporary Ban
87+
88+
**Community Impact**: A serious violation of community standards, including
89+
sustained inappropriate behavior.
90+
91+
**Consequence**: A temporary ban from any sort of interaction or public
92+
communication with the community for a specified period of time. No public or
93+
private interaction with the people involved, including unsolicited interaction
94+
with those enforcing the Code of Conduct, is allowed during this period.
95+
Violating these terms may lead to a permanent ban.
96+
97+
### 3. Permanent Ban
98+
99+
**Community Impact**: Demonstrating a pattern of violation of community
100+
standards, including sustained inappropriate behavior, harassment of an
101+
individual, or aggression toward or disparagement of classes of individuals.
102+
103+
**Consequence**: A permanent ban from any sort of public interaction within the
104+
community.
105+
106+
## Attribution
107+
108+
This Code of Conduct is adapted from the [Django Commons Code of Conduct](https://github.com/django-commons/membership/blob/main/CODE_OF_CONDUCT.md)

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[![Jazzband](https://jazzband.co/static/img/jazzband.svg)](https://jazzband.co/)
1+
# Contribute to Django OAuth Toolkit
22

3-
This is a [Jazzband](https://jazzband.co/) project. By contributing you agree to abide by the [Contributor Code of Conduct](https://jazzband.co/about/conduct) and follow the [guidelines](https://jazzband.co/about/guidelines).
3+
Thanks for your interest, we love contributions! There are many ways to participate. We are always in need of help with code review, bug fixes, feature development, documentation, and community development.
44

5-
# Contribute to Django OAuth Toolkit
5+
By contributing you agree to abide by the [Code of Conduct](./CODE_OF_CONDUCT.md)
66

7-
Thanks for your interest, we love contributions!
7+
We are striving to make a free and open source standards compliant OAuth2/OIDC Identity Provider that adheres to best practices out of the box. Let that goal be your guide as you make decisions related to the project.
88

99
Please [follow these guidelines](https://django-oauth-toolkit.readthedocs.io/en/latest/contributing.html)
1010
when submitting pull requests.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ FROM python:3.11.6-slim
3737
# allow embed sha1 at build time as release.
3838
ARG GIT_SHA1
3939

40-
LABEL org.opencontainers.image.authors="https://jazzband.co/projects/django-oauth-toolkit"
41-
LABEL org.opencontainers.image.source="https://github.com/jazzband/django-oauth-toolkit"
40+
LABEL org.opencontainers.image.authors="https://github.com/django-oauth/django-oauth-toolkit/blob/master/AUTHORS"
41+
LABEL org.opencontainers.image.source="https://github.com/django-oauth/django-oauth-toolkit"
4242
LABEL org.opencontainers.image.revision=${GIT_SHA1}
4343

4444

README.rst

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
Django OAuth Toolkit
22
====================
33

4-
.. image:: https://jazzband.co/static/img/badge.svg
5-
:target: https://jazzband.co/
6-
:alt: Jazzband
7-
84
*OAuth2 goodies for the Djangonauts!*
95

106
.. image:: https://badge.fury.io/py/django-oauth-toolkit.svg
117
:target: http://badge.fury.io/py/django-oauth-toolkit
128

13-
.. image:: https://github.com/jazzband/django-oauth-toolkit/workflows/Test/badge.svg
14-
:target: https://github.com/jazzband/django-oauth-toolkit/actions
9+
.. image:: https://github.com/django-oauth/django-oauth-toolkit/workflows/Test/badge.svg
10+
:target: https://github.com/django-oauth/django-oauth-toolkit/actions
1511
:alt: GitHub Actions
1612

17-
.. image:: https://codecov.io/gh/jazzband/django-oauth-toolkit/branch/master/graph/badge.svg
18-
:target: https://codecov.io/gh/jazzband/django-oauth-toolkit
13+
.. image:: https://codecov.io/gh/django-oauth/django-oauth-toolkit/branch/master/graph/badge.svg
14+
:target: https://codecov.io/gh/django-oauth/django-oauth-toolkit
1915
:alt: Coverage
2016

2117
.. image:: https://img.shields.io/pypi/pyversions/django-oauth-toolkit.svg
@@ -38,7 +34,7 @@ capabilities to your Django projects. Django OAuth Toolkit makes extensive use o
3834
Reporting security issues
3935
-------------------------
4036

41-
Please report any security issues to the JazzBand security team at <security@jazzband.co>. Do not file an issue on the tracker.
37+
Please report any security issues to the Django OAuth security team at <django-oauth-security@googlegroups.com>. Do not file an issue on the tracker.
4238

4339
Requirements
4440
------------
@@ -78,7 +74,7 @@ If you need an OAuth2 provider you'll want to add the following to your ``urls.p
7874
Changelog
7975
---------
8076

81-
See `CHANGELOG.md <https://github.com/jazzband/django-oauth-toolkit/blob/master/CHANGELOG.md>`_.
77+
See `CHANGELOG.md <https://github.com/django-oauth/django-oauth-toolkit/blob/master/CHANGELOG.md>`_.
8278

8379

8480
Documentation
@@ -99,25 +95,24 @@ We need help maintaining and enhancing django-oauth-toolkit (DOT).
9995
Join the team
10096
~~~~~~~~~~~~~
10197

102-
Please consider joining `Jazzband <https://jazzband.co>`__ (If not
103-
already a member) and the `DOT project
104-
team <https://jazzband.co/projects/django-oauth-toolkit>`__.
98+
There are no barriers to participation. Anyone can open an issue, pr, or review a pull request. Please
99+
dive in!
105100

106101
How you can help
107102
~~~~~~~~~~~~~~~~
108103

109104
See our
110105
`contributing <https://django-oauth-toolkit.readthedocs.io/en/latest/contributing.html>`__
111106
info and the open
112-
`issues <https://github.com/jazzband/django-oauth-toolkit/issues>`__ and
113-
`PRs <https://github.com/jazzband/django-oauth-toolkit/pulls>`__,
107+
`issues <https://github.com/django-oauth/django-oauth-toolkit/issues>`__ and
108+
`PRs <https://github.com/django-oauth/django-oauth-toolkit/pulls>`__,
114109
especially those labeled
115-
`help-wanted <https://github.com/jazzband/django-oauth-toolkit/labels/help-wanted>`__.
110+
`help-wanted <https://github.com/django-oauth/django-oauth-toolkit/labels/help-wanted>`__.
116111

117112
Discussions
118113
~~~~~~~~~~~
119114
Have questions or want to discuss the project?
120-
See `the discussions <https://github.com/jazzband/django-oauth-toolkit/discussions>`__.
115+
See `the discussions <https://github.com/django-oauth/django-oauth-toolkit/discussions>`__.
121116

122117

123118
Submit PRs and Perform Reviews
@@ -127,18 +122,12 @@ PR submissions and reviews are always appreciated! Since we require an
127122
independent review of any PR before it can be merged, having your second
128123
set of eyes looking at PRs is extremely valuable.
129124

130-
Please don’t merge PRs
131-
~~~~~~~~~~~~~~~~~~~~~~
132-
133-
Please be aware that we don’t want *every* Jazzband member to merge PRs
134-
but just a handful of project team members so that we can maintain a
135-
modicum of control over what goes into a release of this security oriented code base. Only `project
136-
leads <https://jazzband.co/projects/django-oauth-toolkit>`__ are able to
137-
publish releases to Pypi and it becomes difficult when creating a new
138-
release for the leads to deal with “unexpected” merged PRs.
139125

140-
Become a Project Lead
126+
Become a Maintainer
141127
~~~~~~~~~~~~~~~~~~~~~
142128

143-
If you are interested in stepping up to be a Project Lead, please take a look at
144-
the `discussion about this <https://github.com/jazzband/django-oauth-toolkit/discussions/1479>`__.
129+
If you are interested in stepping up to be a Maintainer, please open an issue. For maintainers we're
130+
looking for a positive attitude, attentiveness to the specifications, strong coding and
131+
communication skills, and a willingness to work with others. Maintainers are responsible for
132+
merging pull requests, managing issues, creating releases, and ensuring the overall health of the
133+
project.

docs/advanced_topics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ That's all, now Django OAuth Toolkit will use your model wherever an Application
6363

6464
.. note:: ``OAUTH2_PROVIDER_APPLICATION_MODEL`` is the only setting variable that is not namespaced, this
6565
is because of the way Django currently implements swappable models.
66-
See `issue #90 <https://github.com/jazzband/django-oauth-toolkit/issues/90>`_ for details.
66+
See `issue #90 <https://github.com/django-oauth/django-oauth-toolkit/issues/90>`_ for details.
6767

6868
Configuring multiple databases
6969
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)