Merge branch 'main' into glob-fix

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.x"
@@ -21,12 +21,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "${{ matrix.python-version }}"
+          cache: pip
 
       - run: pip install nox
       - run: nox --session test-${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -3,12 +3,15 @@ repos:
     rev: 23.1.0
     hooks:
       - id: black
-        args:
-          - --target-version=py37
-          - --target-version=py38
-          - --target-version=py39
-          - --target-version=py310
-          - --target-version=py311
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: [--py38-plus]
+
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.10.1
 
   - repo: https://github.com/PyCQA/isort
     rev: 5.12.0
@@ -18,12 +21,12 @@ repos:
         args: ["--profile", "black"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-builtin-literals
       - id: check-added-large-files
@@ -35,14 +38,14 @@ repos:
       - id: forbid-new-submodules
       - id: trailing-whitespace
 
-  - repo: https://github.com/PyCQA/pydocstyle.git
-    rev: '6.3.0'
+  - repo: https://github.com/PyCQA/pydocstyle
+    rev: 6.3.0
     hooks:
       - id: pydocstyle
         files: src/.*\.py$
 
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
+    rev: 1.16.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==22.10.0]
+        additional_dependencies: [black==23.10.1]

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Thank you for being interested in contributing to the `sphinx-autobuild`! You
 are awesome. :sparkles:
 
-See the [EBP Contributing Guide](https://executablebooks.org/en/latest/contributing.html) for general details,
+See the [EBP Contributing Guide](https://executablebooks.org/en/latest/contribute/) for general details,
 then this page contains information to help you get started with development on this project.
 
 ## Feature Suggestions

README.md

@@ -106,7 +106,7 @@ sphinx-autobuild --port=0 --open-browser magikarp/docs magickarp/docs/_build/htm
 
 ## Relevant Sphinx Bugs
 
-Sphinx does not [detect changes in non-document files in incremental mode](https://github.com/GaretJax/sphinx-autobuild/issues/34), like theme files, static files and source code used with autodoc.
+Sphinx does not [detect changes in non-document, non-code files in incremental mode](https://github.com/GaretJax/sphinx-autobuild/issues/34), like theme files and static files.
 
 At the time of writing, the only known workaround is to instruct Sphinx to rebuild the relevant pages. This can be done by disabling incremental mode (with `-a`) or passing relevant `filenames` in addition to source and output directory in the CLI.
 

noxfile.py

@@ -35,7 +35,7 @@ def lint(session):
     session.run("pre-commit", "run", "--all-files", *session.posargs)
 
 
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11"])
+@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12"])
 def test(session):
     _install_this_editable(session, extras=["test"])
 

pyproject.toml

@@ -18,15 +18,15 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 license = {file = "LICENSE"}
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 dependencies = [
   "sphinx",
   "livereload",

src/sphinx_autobuild/build.py

@@ -42,7 +42,7 @@ def show(*, context=None, command=None):
         _log(context, colour=Fore.CYAN)
     if command is not None:
         assert isinstance(command, (list, tuple))
-        _log("> " + " ".join(shlex.quote(s) for s in command), colour=Fore.BLUE)
+        _log("> " + shlex.join(command), colour=Fore.BLUE)
 
 
 def get_builder(watcher, sphinx_args, *, host, port, pre_build_commands):

src/sphinx_autobuild/cli.py

@@ -123,7 +123,7 @@ class RawTextArgumentDefaultsHelpFormatter(
         help="additional command(s) to run prior to building the documentation",
     )
     parser.add_argument(
-        "--version", action="version", version="sphinx-autobuild {}".format(__version__)
+        "--version", action="version", version=f"sphinx-autobuild {__version__}"
     )
 
     sphinx_arguments = ", ".join(