Merge branch '5.x'

# Conflicts:
#	setup.py
#	sphinx/__init__.py
This commit is contained in:
Adam Turner
2022-09-23 17:27:00 +01:00
53 changed files with 1037 additions and 526 deletions

View File

@@ -21,8 +21,6 @@ jobs:
python-version: 3
- name: Check Python version
run: python --version
- name: Unpin docutils
run: sed -i -e "s/'docutils>=.*'/'docutils'/" setup.py
- name: Install graphviz
run: sudo apt-get install graphviz
- name: Install dependencies

View File

@@ -20,6 +20,6 @@ jobs:
with:
python-version: 3
- name: Install dependencies
run: pip install -U tox
run: python -m pip install -U tox pip
- name: Run Tox
run: tox -e ${{ matrix.tool }}