mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Merge branch '5.x' into master
Resolved merge conflicts:
sphinx/ext/extlinks.py
sphinx/ext/napoleon/docstring.py
(and removed from the latter a now unused import for flake8 F401
compliance)
This commit is contained in:
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@@ -5,7 +5,7 @@ on: [push, pull_request]
|
||||
jobs:
|
||||
ubuntu:
|
||||
runs-on: ubuntu-18.04
|
||||
name: Python ${{ matrix.python }}
|
||||
name: Python ${{ matrix.python }} (${{ matrix.docutils }})
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@@ -18,6 +18,8 @@ jobs:
|
||||
docutils: du17
|
||||
- python: "3.10"
|
||||
docutils: du18
|
||||
- python: "3.10"
|
||||
docutils: du19pre
|
||||
- python: "3.11-dev"
|
||||
docutils: py311
|
||||
|
||||
|
||||
Reference in New Issue
Block a user