From 62fc358ac0b97d067100a277aec230d1e28cf83d Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:50:53 -0400 Subject: [PATCH 1/4] MNT: Drop Python 3.7 TST: Test against Sphinx 7.2 instead of 7.1 --- .github/workflows/ci_workflows.yml | 18 +++++++++--------- CHANGES.rst | 2 ++ setup.cfg | 2 +- tox.ini | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index db355e4..e6018c1 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -27,12 +27,12 @@ jobs: toxenv: codestyle # Linux - test different Sphinx versions - - os: ubuntu-latest - python-version: 3.7 - toxenv: py37-test-sphinx40 - os: ubuntu-latest python-version: 3.8 - toxenv: py38-test-sphinx53 + toxenv: py38-test-sphinx40 + - os: ubuntu-latest + python-version: 3.9 + toxenv: py39-test-sphinx53 - os: ubuntu-latest python-version: 3.9 toxenv: py39-test-sphinx62 @@ -41,7 +41,7 @@ jobs: toxenv: py310-test-sphinx70 - os: ubuntu-latest python-version: '3.11' - toxenv: py311-test-sphinx71-cov-clocale + toxenv: py311-test-sphinx72-cov-clocale - os: ubuntu-latest python-version: '3.12-dev' toxenv: py312-test-sphinxdev @@ -49,18 +49,18 @@ jobs: # MacOS X - just the stable and dev - os: macos-latest python-version: '3.10' - toxenv: py310-test-sphinx71-clocale + toxenv: py310-test-sphinx72-clocale - os: macos-latest python-version: '3.11' toxenv: py311-test-sphinxdev # Windows - just the oldest, stable, and dev - os: windows-latest - python-version: 3.7 - toxenv: py37-test-sphinx40 + python-version: 3.8 + toxenv: py38-test-sphinx40 - os: windows-latest python-version: '3.10' - toxenv: py310-test-sphinx71 + toxenv: py310-test-sphinx72 - os: windows-latest python-version: '3.11' toxenv: py311-test-sphinxdev diff --git a/CHANGES.rst b/CHANGES.rst index 0ae248c..f8bb685 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Changes in sphinx-automodapi 0.17.0 (unreleased) ------------------- +- Minimum supported Python version is now 3.8. [#177] + 0.16.0 (2023-08-17) ------------------- diff --git a/setup.cfg b/setup.cfg index efb9aaa..5a915e6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ classifiers = [options] zip_safe = False packages = find: -python_requires = >=3.7 +python_requires = >=3.8 install_requires = sphinx>=4 diff --git a/tox.ini b/tox.ini index 4ec899f..3387a0c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310,311,312}-test-sphinx{40,53,62,70,71,dev}{-cov}{-clocale} +envlist = py{38,39,310,311,312}-test-sphinx{40,53,62,70,72,dev}{-cov}{-clocale} requires = pip >= 18.0 setuptools >= 30.3.0 isolated_build = true @@ -11,7 +11,7 @@ deps = sphinx53: sphinx==5.3.* sphinx62: sphinx==6.2.* sphinx70: sphinx==7.0.* - sphinx71: sphinx==7.1.* + sphinx72: sphinx==7.2.* sphinxdev: git+https://github.com/sphinx-doc/sphinx.git extras = test: test From 2806ce1a042888ceff4181559ea8fbf2b01addd9 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:48:14 -0400 Subject: [PATCH 2/4] TST: Update matrix more --- .github/workflows/ci_workflows.yml | 6 +++--- tox.ini | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index e6018c1..8fa258c 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -32,13 +32,13 @@ jobs: toxenv: py38-test-sphinx40 - os: ubuntu-latest python-version: 3.9 - toxenv: py39-test-sphinx53 + toxenv: py39-test-sphinx62 - os: ubuntu-latest python-version: 3.9 - toxenv: py39-test-sphinx62 + toxenv: py39-test-sphinx70 - os: ubuntu-latest python-version: '3.10' - toxenv: py310-test-sphinx70 + toxenv: py310-test-sphinx71 - os: ubuntu-latest python-version: '3.11' toxenv: py311-test-sphinx72-cov-clocale diff --git a/tox.ini b/tox.ini index 3387a0c..b611583 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,39,310,311,312}-test-sphinx{40,53,62,70,72,dev}{-cov}{-clocale} +envlist = py{38,39,310,311,312}-test-sphinx{40,62,70,71,72,dev}{-cov}{-clocale} requires = pip >= 18.0 setuptools >= 30.3.0 isolated_build = true @@ -7,10 +7,10 @@ isolated_build = true [testenv] changedir = .tmp/{envname} deps = - sphinx40: sphinx==4.0.* - sphinx53: sphinx==5.3.* + sphinx40: sphinx==4.0.0 sphinx62: sphinx==6.2.* sphinx70: sphinx==7.0.* + sphinx71: sphinx==7.1.* sphinx72: sphinx==7.2.* sphinxdev: git+https://github.com/sphinx-doc/sphinx.git extras = From ff5233730a90d96cea9a071565a7c0d202d0d1ca Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:28:41 -0400 Subject: [PATCH 3/4] TST: Add back sphinx53 --- .github/workflows/ci_workflows.yml | 3 +++ tox.ini | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 8fa258c..9de9127 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -30,6 +30,9 @@ jobs: - os: ubuntu-latest python-version: 3.8 toxenv: py38-test-sphinx40 + - os: ubuntu-latest + python-version: 3.8 + toxenv: py38-test-sphinx53 - os: ubuntu-latest python-version: 3.9 toxenv: py39-test-sphinx62 diff --git a/tox.ini b/tox.ini index b611583..66f222f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,39,310,311,312}-test-sphinx{40,62,70,71,72,dev}{-cov}{-clocale} +envlist = py{38,39,310,311,312}-test-sphinx{40,53,62,70,71,72,dev}{-cov}{-clocale} requires = pip >= 18.0 setuptools >= 30.3.0 isolated_build = true @@ -8,6 +8,7 @@ isolated_build = true changedir = .tmp/{envname} deps = sphinx40: sphinx==4.0.0 + sphinx53: sphinx==5.3.* sphinx62: sphinx==6.2.* sphinx70: sphinx==7.0.* sphinx71: sphinx==7.1.* From 8497ebcf8e70b262eefc3534dd03ffb74bb31971 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:43:32 -0400 Subject: [PATCH 4/4] TST: Use sphinx_oldest in tox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Brigitta Sipőcz --- .github/workflows/ci_workflows.yml | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 9de9127..a968a0c 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -29,7 +29,7 @@ jobs: # Linux - test different Sphinx versions - os: ubuntu-latest python-version: 3.8 - toxenv: py38-test-sphinx40 + toxenv: py38-test-sphinx_oldest - os: ubuntu-latest python-version: 3.8 toxenv: py38-test-sphinx53 diff --git a/tox.ini b/tox.ini index 66f222f..12ca6fc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,39,310,311,312}-test-sphinx{40,53,62,70,71,72,dev}{-cov}{-clocale} +envlist = py{38,39,310,311,312}-test-sphinx{_oldest,53,62,70,71,72,dev}{-cov}{-clocale} requires = pip >= 18.0 setuptools >= 30.3.0 isolated_build = true @@ -7,7 +7,7 @@ isolated_build = true [testenv] changedir = .tmp/{envname} deps = - sphinx40: sphinx==4.0.0 + sphinx_oldest: sphinx==4.0.0 sphinx53: sphinx==5.3.* sphinx62: sphinx==6.2.* sphinx70: sphinx==7.0.*