Bump Docutils dependency

This commit is contained in:
Adam Turner
2022-02-05 14:57:09 +00:00
parent d951e55bc3
commit 3420d15cb9
5 changed files with 24 additions and 33 deletions

View File

@@ -5,43 +5,37 @@ on: [push, pull_request]
jobs: jobs:
ubuntu: ubuntu:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
name: Python ${{ matrix.python }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
name: [py36, py37, py38, py39, py310]
include: include:
- name: py36 - python: "3.6"
python: 3.6
docutils: du14 docutils: du14
- name: py37 - python: "3.7"
python: 3.7
docutils: du15 docutils: du15
- name: py38 - python: "3.8"
python: 3.8
docutils: du16 docutils: du16
- name: py39 - python: "3.9"
python: 3.9
docutils: du17 docutils: du17
coverage: "--cov ./ --cov-append --cov-config setup.cfg" coverage: "--cov ./ --cov-append --cov-config setup.cfg"
- name: py310 - python: "3.10"
python: "3.10" docutils: du18
docutils: du17 - python: "3.11-dev"
- name: py311-dev
python: 3.11-dev
docutils: py311 docutils: py311
env: env:
PYTEST_ADDOPTS: ${{ matrix.coverage }} PYTEST_ADDOPTS: ${{ matrix.coverage }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python }} - name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2 uses: actions/setup-python@v3
if: "!endsWith(matrix.python, '-dev')" if: "!endsWith(matrix.python, '-dev')"
with: with:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Set up Python ${{ matrix.python }} (deadsnakes) - name: Set up Python ${{ matrix.python }} (deadsnakes)
uses: deadsnakes/action@v2.0.1 uses: deadsnakes/action@v2.0.1
if: endsWith(matrix.python, '-dev') if: "endsWith(matrix.python, '-dev')"
with: with:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Check Python version - name: Check Python version
@@ -49,10 +43,7 @@ jobs:
- name: Install graphviz - name: Install graphviz
run: sudo apt-get install graphviz run: sudo apt-get install graphviz
- name: Install dependencies - name: Install dependencies
run: pip install -U tox codecov run: python -m pip install -U pip tox codecov
- name: Install the latest py package (for py3.11-dev)
run: pip install -U git+https://github.com/pytest-dev/py
if: ${{ matrix.python == '3.11-dev' }}
- name: Run Tox - name: Run Tox
run: tox -e ${{ matrix.docutils }} -- -vv run: tox -e ${{ matrix.docutils }} -- -vv
- name: codecov - name: codecov
@@ -61,17 +52,13 @@ jobs:
windows: windows:
runs-on: windows-2019 runs-on: windows-2019
strategy:
matrix:
architecture: [x86, x64]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v3
with: with:
architecture: ${{ matrix.architecture }} python-version: 3
- name: Install dependencies - name: Install dependencies
run: pip install -U tox run: python -m pip install -U pip tox
- name: Run Tox - name: Run Tox
run: tox -e py -- -vv run: tox -e py -- -vv

View File

@@ -3,6 +3,9 @@ Release 5.0.0 (in development)
Dependencies Dependencies
------------ ------------
* #10164: Support `Docutils 0.18`_. Patch by Adam Turner.
.. _Docutils 0.18: https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-18-2021-10-26
Incompatible changes Incompatible changes
-------------------- --------------------

View File

@@ -552,7 +552,7 @@ General configuration
make latex O="-D smartquotes_action=" make latex O="-D smartquotes_action="
This can follow some ``make html`` with no problem, in contrast to the This can follow some ``make html`` with no problem, in contrast to the
situation from the prior note. It requires Docutils 0.14 or later. situation from the prior note.
.. versionadded:: 1.6.6 .. versionadded:: 1.6.6

View File

@@ -20,7 +20,7 @@ install_requires = [
'sphinxcontrib-qthelp', 'sphinxcontrib-qthelp',
'Jinja2>=2.3', 'Jinja2>=2.3',
'Pygments>=2.0', 'Pygments>=2.0',
'docutils>=0.14,<0.18', 'docutils>=0.14,<0.19',
'snowballstemmer>=1.1', 'snowballstemmer>=1.1',
'babel>=1.3', 'babel>=1.3',
'alabaster>=0.7,<0.8', 'alabaster>=0.7,<0.8',

View File

@@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.4.0 minversion = 2.4.0
envlist = docs,flake8,mypy,twine,coverage,py{36,37,38,39,310},du{14,15,16,17} envlist = docs,flake8,mypy,twine,coverage,py{36,37,38,39,310},du{14,15,16,17,18}
[testenv] [testenv]
usedevelop = True usedevelop = True
@@ -16,12 +16,13 @@ passenv =
TERM TERM
description = description =
py{36,37,38,39,310}: Run unit tests against {envname}. py{36,37,38,39,310}: Run unit tests against {envname}.
du{12,13,14}: Run unit tests with the given version of docutils. du{14,15,16,17,18}: Run unit tests with the given version of docutils.
deps = deps =
du14: docutils==0.14.* du14: docutils==0.14.*
du15: docutils==0.15.* du15: docutils==0.15.*
du16: docutils==0.16.* du16: docutils==0.16.*
du17: docutils==0.17.* du17: docutils==0.17.*
du18: docutils==0.18.*
extras = extras =
test test
setenv = setenv =