From bbf0bc1ce37a106db6dc0710bbd779d80edb8340 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Wed, 2 Aug 2023 21:27:07 +0200 Subject: [PATCH 1/5] Rename advanced-tools/ => development-tools/ --- {advanced-tools => development-tools}/clang.rst | 0 {advanced-tools => development-tools}/coverity.rst | 0 {advanced-tools => development-tools}/gdb.rst | 0 {advanced-tools => development-tools}/index.rst | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {advanced-tools => development-tools}/clang.rst (100%) rename {advanced-tools => development-tools}/coverity.rst (100%) rename {advanced-tools => development-tools}/gdb.rst (100%) rename {advanced-tools => development-tools}/index.rst (100%) diff --git a/advanced-tools/clang.rst b/development-tools/clang.rst similarity index 100% rename from advanced-tools/clang.rst rename to development-tools/clang.rst diff --git a/advanced-tools/coverity.rst b/development-tools/coverity.rst similarity index 100% rename from advanced-tools/coverity.rst rename to development-tools/coverity.rst diff --git a/advanced-tools/gdb.rst b/development-tools/gdb.rst similarity index 100% rename from advanced-tools/gdb.rst rename to development-tools/gdb.rst diff --git a/advanced-tools/index.rst b/development-tools/index.rst similarity index 100% rename from advanced-tools/index.rst rename to development-tools/index.rst From eecf941d0c570af49d4b5dacf068b4ae73aa970d Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Wed, 2 Aug 2023 21:39:35 +0200 Subject: [PATCH 2/5] Adapt .rst files to the new layout --- conf.py | 6 +++--- development-tools/index.rst | 6 +++--- index.rst | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.py b/conf.py index 36be6625c8..b2fea28ae0 100644 --- a/conf.py +++ b/conf.py @@ -108,9 +108,9 @@ def _asset_hash(path: os.PathLike[str]) -> str: ] rediraffe_redirects = { - "clang.rst": "advanced-tools/clang.rst", - "coverity.rst": "advanced-tools/coverity.rst", - "gdb.rst": "advanced-tools/gdb.rst", + "clang.rst": "development-tools/clang.rst", + "coverity.rst": "development-tools/coverity.rst", + "gdb.rst": "development-tools/gdb.rst", "coredev.rst": "core-developers/become-core-developer.rst", "committing.rst": "core-developers/committing.rst", "developers.rst": "core-developers/developer-log.rst", diff --git a/development-tools/index.rst b/development-tools/index.rst index afa96741f3..6a3e7466e9 100644 --- a/development-tools/index.rst +++ b/development-tools/index.rst @@ -1,6 +1,6 @@ -============== -Advanced Tools -============== +================= +Development Tools +================= .. toctree:: :maxdepth: 5 diff --git a/index.rst b/index.rst index b84a766674..52900cacb4 100644 --- a/index.rst +++ b/index.rst @@ -249,7 +249,7 @@ Full Table of Contents testing/index core-developers/index internals/index - advanced-tools/index + development-tools/index versions .. _Buildbot status: https://www.python.org/dev/buildbot/ From fdcc7920f91a5c2d64c73a1bd7734dd199ba3bbe Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Wed, 2 Aug 2023 21:43:30 +0200 Subject: [PATCH 3/5] Move Development Tools between Testing & Buildbots and Core Developers --- index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.rst b/index.rst index 52900cacb4..82327d46a3 100644 --- a/index.rst +++ b/index.rst @@ -247,9 +247,9 @@ Full Table of Contents triage/index documentation/index testing/index + development-tools/index core-developers/index internals/index - development-tools/index versions .. _Buildbot status: https://www.python.org/dev/buildbot/ From 0fdaafe73bc3c5ab2f91e1d07f9fb14f9fb68f5a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 3 Aug 2023 21:33:28 +0200 Subject: [PATCH 4/5] Add redirects Co-authored-by: Hugo van Kemenade --- conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf.py b/conf.py index b2fea28ae0..50f43bb7a4 100644 --- a/conf.py +++ b/conf.py @@ -109,8 +109,11 @@ def _asset_hash(path: os.PathLike[str]) -> str: rediraffe_redirects = { "clang.rst": "development-tools/clang.rst", + "advanced-tools/clang.rst": "development-tools/clang.rst", "coverity.rst": "development-tools/coverity.rst", + "advanced-tools/coverity.rst": "development-tools/coverity.rst", "gdb.rst": "development-tools/gdb.rst", + "advanced-tools/gdb.rst": "development-tools/gdb.rst", "coredev.rst": "core-developers/become-core-developer.rst", "committing.rst": "core-developers/committing.rst", "developers.rst": "core-developers/developer-log.rst", From cb28456e6a023f10a8da2bd8335b06fbd305de5c Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 3 Aug 2023 21:38:37 +0200 Subject: [PATCH 5/5] Add some comments --- conf.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index 50f43bb7a4..a9b0ec1a7d 100644 --- a/conf.py +++ b/conf.py @@ -108,17 +108,21 @@ def _asset_hash(path: os.PathLike[str]) -> str: ] rediraffe_redirects = { + # Development Tools "clang.rst": "development-tools/clang.rst", - "advanced-tools/clang.rst": "development-tools/clang.rst", "coverity.rst": "development-tools/coverity.rst", - "advanced-tools/coverity.rst": "development-tools/coverity.rst", "gdb.rst": "development-tools/gdb.rst", + # Advanced Tools was renamed Development Tools in gh-1149 + "advanced-tools/clang.rst": "development-tools/clang.rst", + "advanced-tools/coverity.rst": "development-tools/coverity.rst", "advanced-tools/gdb.rst": "development-tools/gdb.rst", + # Core Developers "coredev.rst": "core-developers/become-core-developer.rst", "committing.rst": "core-developers/committing.rst", "developers.rst": "core-developers/developer-log.rst", "experts.rst": "core-developers/experts.rst", "motivations.rst": "core-developers/motivations.rst", + # Developer Workflow "c-api.rst": "developer-workflow/c-api.rst", "communication.rst": "developer-workflow/communication-channels.rst", "devcycle.rst": "developer-workflow/development-cycle.rst", @@ -127,22 +131,27 @@ def _asset_hash(path: os.PathLike[str]) -> str: "langchanges.rst": "developer-workflow/lang-changes.rst", "porting.rst": "developer-workflow/porting.rst", "stdlibchanges.rst": "developer-workflow/stdlib.rst", + # Documentation "docquality.rst": "documentation/help-documenting.rst", "documenting.rst": "documentation/start-documenting.rst", + # Getting Started "fixingissues.rst": "getting-started/fixing-issues.rst", "help.rst": "getting-started/getting-help.rst", "gitbootcamp.rst": "getting-started/git-boot-camp.rst", "pullrequest.rst": "getting-started/pull-request-lifecycle.rst", "setup.rst": "getting-started/setup-building.rst", + # CPython Internals "compiler.rst": "internals/compiler.rst", "exploring.rst": "internals/exploring.rst", "garbage_collector.rst": "internals/garbage-collector.rst", "parser.rst": "internals/parser.rst", + # Testing and Buildbots "buildbots.rst": "testing/buildbots.rst", "coverage.rst": "testing/coverage.rst", "buildworker.rst": "testing/new-buildbot-worker.rst", "runtests.rst": "testing/run-write-tests.rst", "silencewarnings.rst": "testing/silence-warnings.rst", + # Issues and Triaging "gh-faq.rst": "triage/github-bpo-faq.rst", "tracker.rst": "triage/issue-tracker.rst", "gh-labels.rst": "triage/labels.rst",