From abe8c39cad6e932a592127a10ff980cb1be7c926 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Mon, 6 Feb 2023 21:07:05 +0100 Subject: [PATCH] .github/workflows/unit_tests.yml: Update it Only keep the last two major versions for sphinx and drop 4.x. In addition sphinx 6.0 dropped support for python 3.7, so we do the same. Both changes allow us to remove all matrix excludes. --- .github/workflows/unit_tests.yml | 23 ++--------------------- README.rst | 2 +- requirements/production.txt | 2 +- setup.py | 4 ++-- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 7a797984..1ad0c346 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -7,33 +7,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] sphinx-version: - - '4.0.3' - - '4.1.2' - - '4.2.0' - - '4.3.2' - - '4.5.0' - '5.0.2' - '5.1.1' + - '5.2.3' - '5.3.0' - '6.1.3' - git+https://github.com/sphinx-doc/sphinx.git@master - exclude: - # avoid bug in following configurations - # sphinx/util/typing.py:37: in - # from types import Union as types_Union - # ImportError: cannot import name 'Union' from 'types' - - python-version: '3.10' - 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/README.rst b/README.rst index bfc11d78..cbf01022 100644 --- a/README.rst +++ b/README.rst @@ -98,7 +98,7 @@ branch. Requirements ------------ -Breathe requires Python 3.6+, Sphinx 4.0+ and Doxygen 1.8+. +Breathe requires Python 3.8+, Sphinx 5.0+ and Doxygen 1.8+. Mailing List Archives --------------------- diff --git a/requirements/production.txt b/requirements/production.txt index 816dbe45..01942ae0 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,!=5.0.0 +Sphinx>=5.0.2 diff --git a/setup.py b/setup.py index 1ca127eb..3a94b358 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ 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.") +if sys.version_info < (3, 8): + print("ERROR: Sphinx requires at least Python 3.8 to run.") sys.exit(1)