Skip to content

Adopt Contributor Covenant 3#97

Merged
dryan merged 31 commits intomainfrom
docs/adopt-contributor-covenant
Apr 15, 2026
Merged

Adopt Contributor Covenant 3#97
dryan merged 31 commits intomainfrom
docs/adopt-contributor-covenant

Conversation

@dryan
Copy link
Copy Markdown
Member

@dryan dryan commented Feb 17, 2026

The Code of Conduct Working Group has spent the past year discussing how we might best update our CoC for the first time since its creating in 2014. We were inspired by the BeeWare Project's adoption of Contributor Covenant and recognized it as a strong foundation for Django's needs.

We chose Contributor Covenant 3 because:

We plan to merge this proposal on April 15 pending DSF Board approval.

Closes #82

@dryan dryan self-assigned this Feb 17, 2026
Comment thread CODE_OF_CONDUCT.md Outdated
@pauloxnet
Copy link
Copy Markdown
Member

It seems an excellent idea to me. I'll try to find the time to review this one. :)

Added item 7 to the Other Restrictions section to address repeatedly reporting the same or similar incidents after they have been deemed not to be violations, or otherwise submitting reports intended to harass or burden the working group or reported parties.
@dryan dryan requested a review from a team February 25, 2026 15:46
dryan and others added 17 commits February 25, 2026 11:18
- Add comprehensive transparency report section to conferences.md
- Include guidance on when to release, how to publish, what to include/exclude
- Add PSF Transparency Report Guidelines to sources.md
- Inspired by Python Software Foundation best practices
- Rename conferences.md to events.md to be more inclusive of all event types
- Update all references from conferences.md to events.md across documentation
- Update language to use 'event' instead of 'conference' where appropriate
- Retain 'Conference Chairs' as it's a specific role title
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
Co-authored-by: Priya <pahwa.priya19@gmail.com>
…this makes more sense as guidance for affiliated events so I'll move it there in the process-docs PR
@dryan dryan marked this pull request as ready for review March 16, 2026 14:03
@dryan dryan requested a review from a team March 16, 2026 14:03
Copy link
Copy Markdown
Member

@pauloxnet pauloxnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still reviewing but I wanted to add these comments.

Comment thread sources.md
Comment thread CODE_OF_CONDUCT.md Outdated
Comment thread CODE_OF_CONDUCT.md Outdated
Comment thread CODE_OF_CONDUCT.md Outdated
Co-authored-by: Paolo Melchiorre <pmelchiorre@rippling.com>
Comment thread sources.md
dryan and others added 3 commits March 24, 2026 10:15
Co-authored-by: Paolo Melchiorre <pmelchiorre@rippling.com>
Co-authored-by: Paolo Melchiorre <pmelchiorre@rippling.com>
@dryan dryan added enhancement documentation An update to our processes and docs coc-update-2026 Adopting Contributor Covenant v3 labels Mar 27, 2026
@dryan dryan requested a review from a team March 27, 2026 13:24
Copy link
Copy Markdown
Member

@priyapahwa priyapahwa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making the changes. This looks good to me 🙌
edit: unanimous board approval remains pending; will comment once it has been obtained.

Comment thread CODE_OF_CONDUCT.md
Copy link
Copy Markdown
Member

@jefftriplett jefftriplett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was reviewed by the Django Software Foundation board today and approved during our meeting. Great work and congratulations.

@pauloxnet has some really good feedback to follow up on regarding ensuring events have multiple organizer contact details.

dryan added 3 commits April 9, 2026 14:00
- Add In-Person Event Requirements section to events.md covering
  personal space, appropriate items (per local/cultural norms),
  photography/recording, and event-specific policy extensions
- Require sponsored events to designate named CoC point(s) of contact
  with practical on-site reporting guidance
- Add reference to Event Organizer Support Guide in CODE_OF_CONDUCT.md
- Require affiliated programs to designate a named CoC point of contact
  and provide their individual email address to the working group on file
- Add Affiliated Programs Register to working group manual (shared
  Google Drive spreadsheet tracking programs and CoC contacts)
- Update working group manual scope summaries for events and affiliated
  programs to reflect new contact requirements
@la9243228-sys
Copy link
Copy Markdown

la9243228-sys commented Apr 14, 2026 via email

@dryan dryan merged commit a690a0a into main Apr 15, 2026
2 checks passed
@dryan dryan deleted the docs/adopt-contributor-covenant branch April 15, 2026 19:37
dryan added a commit to dryan/djangoproject.com that referenced this pull request Apr 15, 2026
Updates the djangoproject.com Code of Conduct page to reflect the
current version maintained at django/code-of-conduct.

Refs django/code-of-conduct#97
Closes django/code-of-conduct#83
SaptakS pushed a commit to django/djangoproject.com that referenced this pull request Apr 22, 2026
Updates the djangoproject.com Code of Conduct page to reflect the
current version maintained at django/code-of-conduct.

Refs django/code-of-conduct#97
Closes django/code-of-conduct#83
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

coc-update-2026 Adopting Contributor Covenant v3 documentation An update to our processes and docs enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Open a PR with updated CoC text

5 participants