diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c831277039b..1c8285e3493 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,40 +8,31 @@ jobs: strategy: fail-fast: false matrix: - name: [py36, py37, py38, py39, py310] + name: ["py36", "py37", "py38", "py39", "py310", "py311-dev"] 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 - 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 @@ -49,29 +40,48 @@ jobs: - 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 tox pip - name: Run Tox run: tox -e ${{ matrix.docutils }} -- -vv - - name: codecov - uses: codecov/codecov-action@v1 - if: matrix.coverage windows: runs-on: windows-2019 - strategy: - matrix: - architecture: [x86, x64] - steps: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v3 with: - architecture: ${{ matrix.architecture }} + python-version: 3 + architecture: "x64" - name: Install dependencies - run: pip install -U tox + run: python -m pip install -U tox pip - name: Run Tox run: tox -e py -- -vv + + coverage: + if: github.repository_owner == 'sphinx-doc' + runs-on: ubuntu-latest + env: + PYTEST_ADDOPTS: "--cov ./ --cov-append --cov-config setup.cfg" + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3 + uses: actions/setup-python@v3 + with: + python-version: 3 + + - name: Check Python version + run: python --version + + - name: Install graphviz + run: sudo apt-get install graphviz + + - name: Install dependencies + run: python -m pip install -U tox pip codecov + + - name: Run Tox + run: tox -e du18 -- -vv + + - name: codecov + uses: codecov/codecov-action@v1 diff --git a/CHANGES b/CHANGES index e192045e759..9268cb93a77 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ Release 5.0.0 (in development) Dependencies ------------ +* #10164: Support Docutils version 0.18 Incompatible changes -------------------- diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst index 133a0e227b4..677eb39271a 100644 --- a/doc/usage/configuration.rst +++ b/doc/usage/configuration.rst @@ -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 diff --git a/setup.py b/setup.py index 860aae57e04..dda01fc52ab 100644 --- a/setup.py +++ b/setup.py @@ -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', diff --git a/tox.ini b/tox.ini index ca540944369..e2a36acab33 100644 --- a/tox.ini +++ b/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 @@ -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 =