Skip to content

Commit

Permalink
Bump Docutils dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
AA-Turner committed Apr 19, 2022
1 parent d951e55 commit 3420d15
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 33 deletions.
45 changes: 16 additions & 29 deletions .github/workflows/main.yml
Expand Up @@ -5,54 +5,45 @@ on: [push, pull_request]
jobs:
ubuntu:
runs-on: ubuntu-18.04
name: Python ${{ matrix.python }}
strategy:
fail-fast: false
matrix:
name: [py36, py37, py38, py39, py310]
include:
- name: py36
python: 3.6
- python: "3.6"
docutils: du14
- name: py37
python: 3.7
- python: "3.7"
docutils: du15
- name: py38
python: 3.8
- python: "3.8"
docutils: du16
- name: py39
python: 3.9
- python: "3.9"
docutils: du17
coverage: "--cov ./ --cov-append --cov-config setup.cfg"
- name: py310
python: "3.10"
docutils: du17
- name: py311-dev
python: 3.11-dev
- python: "3.10"
docutils: du18
- python: "3.11-dev"
docutils: py311
env:
PYTEST_ADDOPTS: ${{ matrix.coverage }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
if: "!endsWith(matrix.python, '-dev')"
with:
python-version: ${{ matrix.python }}
- name: Set up Python ${{ matrix.python }} (deadsnakes)
uses: deadsnakes/action@v2.0.1
if: endsWith(matrix.python, '-dev')
if: "endsWith(matrix.python, '-dev')"
with:
python-version: ${{ matrix.python }}
- name: Check Python version
run: python --version
- name: Install graphviz
run: sudo apt-get install graphviz
- name: Install dependencies
run: pip install -U 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' }}
run: python -m pip install -U pip tox codecov
- name: Run Tox
run: tox -e ${{ matrix.docutils }} -- -vv
- name: codecov
Expand All @@ -61,17 +52,13 @@ jobs:

windows:
runs-on: windows-2019
strategy:
matrix:
architecture: [x86, x64]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
with:
architecture: ${{ matrix.architecture }}
python-version: 3
- name: Install dependencies
run: pip install -U tox
run: python -m pip install -U pip tox
- name: Run Tox
run: tox -e py -- -vv
3 changes: 3 additions & 0 deletions CHANGES
Expand Up @@ -3,6 +3,9 @@ Release 5.0.0 (in development)

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
--------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/usage/configuration.rst
Expand Up @@ -552,7 +552,7 @@ General configuration
make latex O="-D smartquotes_action="
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

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -20,7 +20,7 @@
'sphinxcontrib-qthelp',
'Jinja2>=2.3',
'Pygments>=2.0',
'docutils>=0.14,<0.18',
'docutils>=0.14,<0.19',
'snowballstemmer>=1.1',
'babel>=1.3',
'alabaster>=0.7,<0.8',
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
@@ -1,6 +1,6 @@
[tox]
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]
usedevelop = True
Expand All @@ -16,12 +16,13 @@ passenv =
TERM
description =
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 =
du14: docutils==0.14.*
du15: docutils==0.15.*
du16: docutils==0.16.*
du17: docutils==0.17.*
du18: docutils==0.18.*
extras =
test
setenv =
Expand Down

0 comments on commit 3420d15

Please sign in to comment.