Merge branch 'main' into issue-396

python · Oct 1, 2022 · f17f1b3 · f17f1b3
2 parents 17cc30e + a676a67
commit f17f1b3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,20 +7,23 @@ jobs:
     strategy:
       matrix:
         python:
-        # Build on pre-releases until stable, then stable releases.
-        # actions/setup-python#213
-        - ~3.7.0-0
-        - ~3.10.0-0
-        - ~3.11.0-0
+        - "3.7"
+        - "3.10"
+        - "3.11"
+        # Workaround for actions/setup-python#508
+        dev:
+        - -dev
         platform:
         - ubuntu-latest
         - macos-latest
         - windows-latest
         include:
+        - python: pypy3.9
+          platform: ubuntu-latest
         - platform: ubuntu-latest
-          python: ~3.8.0-0
+          python: "3.8"
         - platform: ubuntu-latest
-          python: ~3.9.0-0
+          python: "3.9"
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v3
@@ -29,9 +32,9 @@ jobs:
           # ref actions/checkout#448
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python }}
+          python-version: ${{ matrix.python }}${{ matrix.dev }}
       - name: Install tox
         run: |
           python -m pip install tox
@@ -79,9 +82,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: 3.11-dev
       - name: Install tox
         run: |
           python -m pip install tox

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,9 +1,15 @@
 #!/usr/bin/env python3
 
-extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
+extensions = [
+    'sphinx.ext.autodoc',
+    'jaraco.packaging.sphinx',
+]
 
 master_doc = "index"
+html_theme = "furo"
 
+# Link dates and other references in the changelog
+extensions += ['rst.linker']
 link_files = {
     '../CHANGES.rst': dict(
         using=dict(GH='https://github.com'),
@@ -28,7 +34,7 @@
     )
 }
 
-# Be strict about any broken references:
+# Be strict about any broken references
 nitpicky = True
 
 # Include Python intersphinx mapping to prevent failures
@@ -38,6 +44,11 @@
     'python': ('https://docs.python.org/3', None),
 }
 
+# Preserve authored syntax for defaults
+autodoc_preserve_defaults = True
+
+extensions += ['jaraco.tidelift']
+
 intersphinx_mapping.update(
     importlib_resources=(
         'https://importlib-resources.readthedocs.io/en/latest/',
@@ -51,5 +62,3 @@
     ('py:class', 'importlib_metadata.SelectableGroups'),
     ('py:class', 'importlib_metadata._meta._T'),
 ]
-
-extensions += ['jaraco.tidelift']
diff --git a/setup.cfg b/setup.cfg
@@ -34,6 +34,8 @@ testing =
 	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
+	# workaround for tholo/pytest-flake8#87
+	flake8 < 5
 	pytest-black >= 0.3.7; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
@@ -52,9 +54,10 @@ testing =
 
 docs =
 	# upstream
-	sphinx
+	sphinx >= 3.5
 	jaraco.packaging >= 9
 	rst.linker >= 1.9
+	furo
 	jaraco.tidelift >= 1.4
 
 	# local