Skip to content

Commit

Permalink
Merge branch 'michaeljones:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
chbauman authored Jun 3, 2022
2 parents 92bf4e3 + 72fe244 commit 0e7f6e6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,20 @@ jobs:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
sphinx-version:
- '3.0.4'
- '3.1.2'
- '3.2.1'
- '3.3.1'
- '3.4.3'
- '3.5.4'
- '4.0.3'
- '4.1.2'
- '4.2.0'
- '4.3.2'
- '4.4.0'
- git+https://github.com/sphinx-doc/sphinx.git@4.4.x
- git+https://github.com/sphinx-doc/sphinx.git@4.x
- '4.5.0'
- '5.0.1'
- git+https://github.com/sphinx-doc/sphinx.git@5.0.x
- git+https://github.com/sphinx-doc/sphinx.git@5.x
- git+https://github.com/sphinx-doc/sphinx.git@master
# avoid bug in following configurations
# sphinx/util/typing.py:37: in <module>
# from types import Union as types_Union
# ImportError: cannot import name 'Union' from 'types'
exclude:
- python-version: '3.10'
sphinx-version: '3.5.4'
- python-version: '3.10'
sphinx-version: '4.0.3'
- python-version: '3.10'
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ branch.
Requirements
------------

Breathe requires Python 3.6+, Sphinx 3.0+ and Doxygen 1.8+.
Breathe requires Python 3.6+, Sphinx 4.0+ and Doxygen 1.8+.

Mailing List Archives
---------------------
Expand Down
2 changes: 1 addition & 1 deletion requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ mypy>=0.900
types-docutils>=0.14,<0.18
types-Pygments

black==22.1.0
black==22.3.0
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ docutils>=0.12
Jinja2>=2.7.3
MarkupSafe>=0.23
Pygments>=1.6
Sphinx>=3.0,<5
Sphinx>=4.0,<6,!=5.0.0

0 comments on commit 0e7f6e6

Please sign in to comment.