Skip to content

Commit e0bc90a

Browse files
authored
Contrib guide: more restructuring (#1461)
* contrib guide: more restructuring * review comment fixes * table tweaks
1 parent 1d6cc2f commit e0bc90a

17 files changed

+147
-21
lines changed

_static/devguide_overrides.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,9 @@
9494
font-size: var(--font-size--small--2);
9595
padding: .1em .2em;
9696
}
97+
98+
/* Table cells should always top-align */
99+
100+
table.docutils td {
101+
vertical-align: top;
102+
}

contrib/code/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_code:
2+
13
==================
24
Code contributions
35
==================

contrib/project/core-team/committing.rst renamed to contrib/core-team/committing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`committing` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../../core-developers/committing.rst
11+
.. include:: ../../core-developers/committing.rst

contrib/project/core-team/developer-log.rst renamed to contrib/core-team/developer-log.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`developer-log` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../../core-developers/developer-log.rst
11+
.. include:: ../../core-developers/developer-log.rst

contrib/project/core-team/experts.rst renamed to contrib/core-team/experts.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`experts` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../../core-developers/experts.rst
11+
.. include:: ../../core-developers/experts.rst
File renamed without changes.

contrib/project/core-team/join-team.rst renamed to contrib/core-team/join-team.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ adjust "core developer" to "core team" where appropriate.]
1212
How to join the core team
1313
=========================
1414

15-
.. include:: ../../../core-developers/become-core-developer.rst
15+
.. include:: ../../core-developers/become-core-developer.rst
1616
:start-line: 7

contrib/project/core-team/motivations.rst renamed to contrib/core-team/motivations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`motivations` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../../core-developers/motivations.rst
11+
.. include:: ../../core-developers/motivations.rst

contrib/project/core-team/responsibilities.rst renamed to contrib/core-team/responsibilities.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[This is the existing core developers :ref:`responsibilities` page from the devguide. We'll
99
adjust "core developer" to "core team" where appropriate.]
1010

11-
.. include:: ../../../core-developers/responsibilities.rst
11+
.. include:: ../../core-developers/responsibilities.rst

contrib/doc/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_docs:
2+
13
===========================
24
Documentation contributions
35
===========================

contrib/get-started/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_gettingstarted:
2+
13
===============
24
Getting started
35
===============

contrib/index.rst

Lines changed: 90 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,104 @@
1+
.. _c_root:
2+
13
==================================
24
Python Contributor's Guide (draft)
35
==================================
46

7+
.. raw:: html
8+
9+
<script>
10+
document.addEventListener('DOMContentLoaded', function() {
11+
activateTab(getOS());
12+
});
13+
</script>
14+
15+
516
.. important::
617

718
|draft|
819

920
|purpose|
1021

1122

12-
This guide is a comprehensive resource for contributing to Python.
23+
[Open question: how to divide content between this Introduction and the
24+
:ref:`introduction <c_intro>`?]
25+
26+
This guide is a comprehensive resource for :ref:`contributing <contributing>`
27+
to Python_ -- for both new and experienced contributors. It is :ref:`maintained
28+
<devguide>` by the same community that maintains Python. We welcome your
29+
contributions to Python!
30+
31+
We encourage everyone to contribute to Python. This guide should have
32+
everything you need to get started and be productive. If you still have
33+
questions after reviewing the material in this guide, the `Core Python
34+
Mentorship`_ group is available to help you through the process.
35+
36+
There are a number of ways to contribute including code, documentation, and
37+
triaging issues. We've organized this guide to provide specifics based on the
38+
type of activity you'll be engaged in.
39+
40+
41+
Using this guide
42+
================
1343

14-
.. note::
15-
This is a draft of a new organization for the devguide, turning it into a
16-
Contributor's Guide.
44+
We recommend reading this guide as needed. You can stop where you feel
45+
comfortable and begin contributing immediately without reading and
46+
understanding everything. If you do choose to skip around this guide, be aware
47+
that it is written assuming preceding sections have been read so you may need
48+
to backtrack to fill in missing concepts and terminology.
1749

18-
[Much of the devguide home page will be here. The Quick Start will be updated
19-
to distinguish code vs documentation contributions, and moved to those
20-
sections. Other changes will be made to explain the different types of
21-
contribution and how to navigate the guide for your own type.]
50+
No matter what kind of contribution you'll be making, you should start with
51+
these common sections:
52+
53+
* :ref:`c_intro`
54+
* :ref:`c_project`
55+
* :ref:`c_gettingstarted`
56+
57+
Then choose a path based on your type of activity:
58+
59+
*[The original table on the devguide home had a fourth column for Core
60+
Developers. That made the table wider and more confusing. I don't think core
61+
team members need a quick intro path since they will have been through the
62+
devguide before.]*
63+
64+
*[I haven't adjusted the links in the table yet other than to add a link to the
65+
major section at the top of each column.]*
66+
67+
.. list-table::
68+
:widths: 10 10 10
69+
:header-rows: 1
70+
71+
* - :ref:`Triaging <c_triage>`
72+
- :ref:`Documentation <c_docs>`
73+
- :ref:`Code <c_code>`
74+
* -
75+
* :ref:`tracker`
76+
* :ref:`triaging`
77+
* :ref:`helptriage`
78+
* :ref:`experts`
79+
* :ref:`labels`
80+
* :ref:`gh-faq`
81+
* :ref:`triage-team`
82+
-
83+
* :ref:`docquality`
84+
* :ref:`documenting`
85+
* :ref:`style-guide`
86+
* :ref:`rst-primer`
87+
* :ref:`translating`
88+
* :ref:`devguide`
89+
-
90+
* :ref:`setup`
91+
* :ref:`help`
92+
* :ref:`pullrequest`
93+
* :ref:`runtests`
94+
* :ref:`fixingissues`
95+
* :ref:`communication`
96+
* :ref:`gitbootcamp`
97+
* :ref:`devcycle`
2298

2399

24100
.. toctree::
25-
:maxdepth: 2
101+
:maxdepth: 3
26102

27103
contrib-plan
28104
intro/index
@@ -31,6 +107,10 @@ contribution and how to navigate the guide for your own type.]
31107
triage/index
32108
code/index
33109
doc/index
110+
core-team/index
34111
user-success
35112
security
36-
outreach
113+
114+
115+
.. _Python: https://www.python.org/
116+
.. _Core Python Mentorship: https://www.python.org/dev/core-mentorship/

contrib/intro/index.rst

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_intro:
2+
13
============
24
Introduction
35
============
@@ -10,10 +12,27 @@ Introduction
1012

1113

1214

15+
[Open question: how to divide content between this Introduction and the
16+
:ref:`home page <c_root>`?]
1317

1418
Welcome!
1519

16-
Healthy Collaboration
20+
New to open source?
21+
===================
22+
23+
Python is an open source project, with culture and techniques from the broader
24+
open source world. You might find it helpful to read about open source in
25+
general. A number of individuals from the Python community have contributed to
26+
a series of excellent guides at `Open Source Guides
27+
<https://opensource.guide/>`_.
28+
29+
Anyone will find the following guides useful:
30+
31+
* `How to Contribute to Open Source <https://opensource.guide/how-to-contribute/>`_
32+
* `Building Welcoming Communities <https://opensource.guide/building-community/>`_
33+
34+
35+
Healthy collaboration
1736
=====================
1837

1938
[Importance of healthy inclusive collaboration]
@@ -22,13 +41,13 @@ Healthy Collaboration
2241

2342
[We respect the individual skills people bring to the project and strive to create and maintain a culture of inclusion.]
2443

25-
About this Guide
44+
About this guide
2645
================
2746

28-
Types of Contribution
47+
Types of contribution
2948
=====================
3049

3150
[Pathways for contributors]
3251

33-
Helping with this Guide
52+
Helping with this guide
3453
=======================

contrib/project/generative-ai.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. important::
2+
3+
|draft|
4+
5+
|purpose|
6+
7+
8+
[This is the existing :ref:`generative-ai` page from the devguide.]
9+
10+
.. include:: ../../getting-started/generative-ai.rst

contrib/project/index.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_project:
2+
13
===================
24
The CPython project
35
===================
@@ -19,7 +21,8 @@ moving parts, who is involved, how do they interact?]
1921

2022
conduct
2123
roles
22-
core-team/index
2324
governance
25+
generative-ai.rst
2426
github
2527
channels
28+
outreach
File renamed without changes.

contrib/triage/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _c_triage:
2+
13
===================
24
Issues and triaging
35
===================

0 commit comments

Comments
 (0)