Skip to content

Commit

Permalink
[0.10] CI check for Sphinx 6.0 (#202)
Browse files Browse the repository at this point in the history
* Add CI for sphinx 6.0

* Force install sphinx
  • Loading branch information
nabobalis authored Feb 20, 2023
1 parent 13d5421 commit 1389416
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ ci:
autofix_prs: false
repos:
- repo: https://github.com/myint/autoflake
rev: v1.4
rev: v2.0.1
hooks:
- id: autoflake
args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 22.6.0
rev: 23.1.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-ast
- id: check-case-conflict
Expand All @@ -30,7 +30,7 @@ repos:
- id: stylelint
additional_dependencies: ['[email protected]', '[email protected]']
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
rev: v3.0.0-alpha.4
hooks:
- id: prettier
types_or: [css, scss, javascript]
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ stages:
- windows: py37-sphinx4
- linux: py37-sphinx5
- linux: py38-sphinx4
- linux: py311-sphinx6
- linux: py310-docs

- stage: ThirdPhaseTests
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ filterwarnings =
always::pytest.PytestConfigWarning
# Update this when we depend on higher levels of Sphinx.
ignore:nodes.Node.traverse\(\) is obsoleted by Node.findall\(\)
# Sphinx raises this for now
ignore:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning
ignore:.*pkg_resources.declare_namespace.*
ignore:The alias.*

[pycodestyle]
max_line_length = 110
Expand Down
23 changes: 10 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
[tox]
envlist =
py{37,38,39,310,311}{-sphinx4,-sphinx5,-sphinx6,-sphinxdev,-docs,-conda}
py{37,38,39,310,311}{-sphinx4,-sphinx5,-sphinx6,-sphinx7,-sphinxdev,-docs,-conda}
codestyle
requires =
setuptools >= 30.3.0
pip >= 19.3.1
tox-pypi-filter >= 0.12
isolated_build = true

[testenv]
whitelist_externals=
allowlist_externals=
/bin/bash
/usr/bin/bash
/bin/make
/usr/bin/make
make
deps =
sphinx4: sphinx>=4.0,<5.0
sphinx5: sphinx>=5.0,<6.0
sphinx6: sphinx>=6.0,<7.0
sphinxdev: git+https://github.com/sphinx-doc/sphinx
sphinxdev: "git+https://repo.or.cz/docutils.git#egg=docutils&subdirectory=docutils"
extras =
all
docs
tests
commands =
# Have to do this here as myst-parser in the install step forces it to be non-dev.
sphinxdev: pip install -U "git+https://repo.or.cz/docutils.git#egg=docutils&subdirectory=docutils"
sphinxdev: pip install -U git+https://github.com/sphinx-doc/sphinx
sphinx4: pip install -U "sphinx>=4.0,<5.0"
sphinx5: pip install -U "sphinx>=5.0,<6.0"
sphinx6: pip install -U "sphinx>=6.0,<7.0"
sphinx7: pip install -U "sphinx>=7.0,<8.0"
sphinxdev: pip install -U "git+https://github.com/sphinx-doc/sphinx"
pip freeze --all --no-input
pytest ./
make tests

Expand All @@ -50,7 +46,6 @@ commands =

# Requires tox-conda
[testenv:py{38,39,310,311}-conda]
pypi_filter =
extras =
deps =
conda_deps =
Expand All @@ -60,10 +55,12 @@ conda_deps =
git
graphviz
invoke
ipython
make
myst-parser
nbsphinx
pandoc
pytest
python-dateutil
sphinx
sphinx-automodapi
Expand Down

0 comments on commit 1389416

Please sign in to comment.