Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Sphinx 6.1.3 to test matrix #885

Merged
merged 6 commits into from
Jan 18, 2023
Merged

Add Sphinx 6.1.3 to test matrix #885

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef4e245
Add Sphinx 6.1.3 to test matrix
michaeljones Jan 17, 2023
00b29e8
Adjust constraint setup.py
michaeljones Jan 17, 2023
687a327
Adjust constraint in production requirements.txt
michaeljones Jan 17, 2023
81a92d8
Update changelog with latest changes
michaeljones Jan 17, 2023
86298cc
Remove <7 constraint from requirement file
michaeljones Jan 18, 2023
4258539
Remove <7 constraint from setup.py
michaeljones Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/unit_tests.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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,<7,!=5.0.0
michaeljones marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
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,<7,!=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