Skip to content

Commit

Permalink
Merge pull request #885 from breathe-doc/sphinx-6
Browse files Browse the repository at this point in the history
Add Sphinx 6.1.3 to test matrix
  • Loading branch information
michaeljones authored Jan 18, 2023
2 parents c4013f4 + 4258539 commit b4564e9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- '5.0.2'
- '5.1.1'
- '5.3.0'
- '6.1.3'
- git+https://github.com/sphinx-doc/sphinx.git@master
exclude:
# avoid bug in following configurations
Expand All @@ -27,9 +28,12 @@ jobs:
sphinx-version: '4.0.3'
- python-version: '3.10'
sphinx-version: '4.1.2'

# Sphinx has removed support for Python 3.7, Breathe will follow.
- python-version: '3.7'
sphinx-version: git+https://github.com/sphinx-doc/sphinx.git@master
- python-version: '3.7'
sphinx-version: '6.1.3'

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Inspired by `Keepachangelog.com <http://keepachangelog.com/>`__.
`#865 <https://github.com/breathe-doc/breathe/pull/865>`__
- Bump Python requirement to 3.7.
`#866 <https://github.com/breathe-doc/breathe/pull/866>`__
- Support Sphinx 6.
`#885 <https://github.com/breathe-doc/breathe/pull/885>`__
- Support ``:sort:`` option to sort sections by name.
`#879 <https://github.com/breathe-doc/breathe/pull/879>`__

- 2022-06-20 - **Breathe v4.34.0**

Expand Down
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>=4.0,<6,!=5.0.0
Sphinx>=4.0,!=5.0.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
render `Doxygen <http://www.doxygen.org>`__ xml output.
"""

requires = ["Sphinx>=4.0,<6,!=5.0.0", "docutils>=0.12"]
requires = ["Sphinx>=4.0,!=5.0.0", "docutils>=0.12"]

if sys.version_info < (3, 7):
print("ERROR: Sphinx requires at least Python 3.7 to run.")
Expand Down

0 comments on commit b4564e9

Please sign in to comment.