Merge branch 'main' into per-req-config-settings

Author: q0w

.github/chronographer.yml

@@ -1,30 +1,10 @@
----
-
+branch-protection-check-name: Changelog entry
 action-hints:
-  # check-title-prefix: chng  # default: `{{ branch-protection-check-name }}: `
-  external-docs-url: https://pip.pypa.io/how-to-changelog
+  check-title-prefix: "Chronographer: "
+  external-docs-url: https://pip.pypa.io/dev/news-entry-failure
   inline-markdown: >
-    Check out https://pip.pypa.io/how-to-changelog
-
-branch-protection-check-name: Timeline protection
-
+    See https://pip.pypa.io/dev/news-entry-failure for details.
 enforce-name:
-  # suffix: .md
   suffix: .rst
-
-exclude:
-  bots:
-  - dependabot-preview
-  - dependabot
-  - patchback
-  humans:
-  - pyup-bot
-
 labels:
   skip-changelog: skip news
-
-paths:  # relative modified file paths that do or don't need changelog mention
-  exclude: []
-  include: []
-
-...

.github/workflows/label-merge-conflicts.yml

@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -17,18 +17,18 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black
-  rev: 22.6.0
+  rev: 23.1.0
   hooks:
   - id: black
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 6.0.0
   hooks:
   - id: flake8
     additional_dependencies: [
-        'flake8-bugbear==22.10.27',
-        'flake8-logging-format==0.9.0',
-        'flake8-implicit-str-concat==0.3.0',
+        'flake8-bugbear',
+        'flake8-logging-format',
+        'flake8-implicit-str-concat',
     ]
     exclude: tests/data
 
@@ -56,7 +56,7 @@ repos:
     ]
 
 - repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.9.0
+  rev: v1.10.0
   hooks:
   - id: python-no-log-warn
   - id: python-no-eval

.pre-commit-config.yaml

@@ -131,3 +131,9 @@ def to_document_name(path: str, base_dir: str) -> str:
 
 
 man_pages = determine_man_pages()
+
+# -- Options for sphinx_copybutton ----------------------------------------------------
+
+copybutton_prompt_text = r"\$ | C\:\> "
+copybutton_prompt_is_regexp = True
+copybutton_only_copy_prompt_lines = False

docs/html/conf.py

@@ -98,5 +98,5 @@ Successfully uninstalled sampleproject
 ## Next Steps
 
 It is recommended to learn about what virtual environments are and how to use
-them. This is covered in the ["Installing Packages"](pypug:tutorials/installing-packages)
+them. This is covered in the {doc}`Installing Packages <pypug:tutorials/installing-packages>`
 tutorial on packaging.python.org.

docs/html/getting-started.md

@@ -17,10 +17,9 @@ When considering use cases, please bear in mind that
   other use cases), this format is *not* meant to be a lock file format as such;
 - there is no plan for pip to accept an installation report as input for the `install`,
   `download` or `wheel` commands;
-- the `--report` option and this format is intended to become a supported pip feature
-  (when the format is stabilized to version 1);
-- it is however *not* a PyPA interoperability standard and as such its evolution will be
-  governed by the pip processes and not the PyPA standardization processes.
+- while the `--report` option and this format is a supported pip feature,
+  it is *not* a PyPA interoperability standard and as such its evolution is governed by
+  the pip processes and not the PyPA standardization processes.
 ```
 
 ## Specification

docs/html/reference/installation-report.md

@@ -254,7 +254,6 @@ def run(self) -> List[nodes.Node]:
         lines = []
         # Create a tab for each OS
         for os, variant in os_variants.items():
-
             # Unpack the values
             prompt = variant["prompt"]
             highlighter = variant["highlighter"]

docs/pip_sphinxext.py

@@ -1,4 +1,4 @@
-sphinx ~= 4.2, != 4.4.0
+sphinx ~= 6.0
 towncrier
 furo
 myst_parser

docs/requirements.txt

@@ -0,0 +1,2 @@
+Strip command line prompts like "$" and "C:>" from the actual command
+being copied using the copybutton.

news/11702.trivial.rst

@@ -0,0 +1 @@
+Normalize paths before checking if installed scripts are on PATH.