diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 919d44501..7a797984e 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -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 @@ -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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1c40dd0de..349fce8e8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,10 @@ Inspired by `Keepachangelog.com `__. `#865 `__ - Bump Python requirement to 3.7. `#866 `__ + - Support Sphinx 6. + `#885 `__ + - Support ``:sort:`` option to sort sections by name. + `#879 `__ - 2022-06-20 - **Breathe v4.34.0** diff --git a/requirements/production.txt b/requirements/production.txt index 688298a37..816dbe455 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -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 diff --git a/setup.py b/setup.py index fb7f73b0f..1ca127eb7 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ render `Doxygen `__ 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.")