From bfc66b08cac5c94b0031e543656d3c3994558ceb Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Mon, 3 Feb 2025 17:55:02 -0500 Subject: [PATCH 1/2] MNT: Update test matrix, build infra --- .github/workflows/ci_workflows.yml | 9 ++++++--- .github/workflows/publish.yml | 2 +- .readthedocs.yml | 2 +- LICENSE.rst | 2 +- MANIFEST.in | 1 + pyproject.toml | 4 ++-- setup.cfg | 4 +--- setup.py | 5 ----- tox.ini | 3 ++- 9 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 setup.py diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index a8e07ca..43a106d 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -48,14 +48,17 @@ jobs: - os: ubuntu-latest python-version: '3.12' toxenv: py312-test-sphinx80 + - os: ubuntu-latest + python-version: '3.12' + toxenv: py312-test-sphinx81 - os: ubuntu-latest python-version: '3.13' toxenv: py313-test-sphinxdev # MacOS X - just the stable and dev - os: macos-latest - python-version: '3.10' - toxenv: py310-test-sphinx80-clocale + python-version: '3.11' + toxenv: py311-test-sphinx81-clocale - os: macos-latest python-version: '3.13' toxenv: py313-test-sphinxdev @@ -66,7 +69,7 @@ jobs: toxenv: py38-test-sphinx_oldest - os: windows-latest python-version: '3.10' - toxenv: py310-test-sphinx80 + toxenv: py310-test-sphinx81 - os: windows-latest python-version: '3.13' toxenv: py313-test-sphinxdev diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f46a52b..5bdb24a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0 with: - python-version: 3.8 + python-version: "3.12" - name: Install dependencies run: | diff --git a/.readthedocs.yml b/.readthedocs.yml index c85d6b6..5109e33 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -7,7 +7,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.11" + python: "3.12" jobs: post_checkout: - git fetch --shallow-since=2023-01-01 || true diff --git a/LICENSE.rst b/LICENSE.rst index 4f6e337..ecbe4fc 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,4 +1,4 @@ -Copyright (c) 2014-2016, Astropy Developers +Copyright (c) 2014-2025, Astropy Developers All rights reserved. diff --git a/MANIFEST.in b/MANIFEST.in index 6f1d2ae..0474c00 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,7 @@ include CHANGES.rst include LICENSE.rst include setup.cfg +inckude pyproject.toml exclude *.pyc *.o prune build diff --git a/pyproject.toml b/pyproject.toml index e06fcb3..9765e29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [build-system] requires = ["setuptools>=30.3.0", - "setuptools_scm", + "setuptools_scm>=8.0.0", "wheel"] build-backend = 'setuptools.build_meta' [tool.setuptools_scm] -write_to = "sphinx_automodapi/version.py" +version_file = "sphinx_automodapi/version.py" diff --git a/setup.cfg b/setup.cfg index a4eec45..6f619d9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ author_email = astropy.team@gmail.com license = BSD 3-Clause License url = https://github.com/astropy/sphinx-automodapi classifiers = - Development Status :: 3 - Alpha + Development Status :: 5 - Production/Stable Intended Audience :: Developers Programming Language :: Python Programming Language :: Python :: 3 @@ -31,8 +31,6 @@ test = coverage setuptools;python_version>='3.12' rtd = - # https://github.com/readthedocs/sphinx_rtd_theme/issues/1463 - sphinx<7 sphinx-rtd-theme [options.package_data] diff --git a/setup.py b/setup.py deleted file mode 100644 index beda28e..0000000 --- a/setup.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup - -setup() diff --git a/tox.ini b/tox.ini index dcf8ab5..aa8bf3b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,39,310,311,312,313}-test-sphinx{_oldest,53,62,70,71,72,80,dev}{-cov}{-clocale} +envlist = py{38,39,310,311,312,313}-test-sphinx{_oldest,53,62,70,71,72,80,81,dev}{-cov}{-clocale} requires = pip >= 18.0 setuptools >= 30.3.0 isolated_build = true @@ -14,6 +14,7 @@ deps = sphinx71: sphinx==7.1.* sphinx72: sphinx==7.2.* sphinx80: sphinx==8.0.* + sphinx81: sphinx==8.1.* sphinxdev: git+https://github.com/sphinx-doc/sphinx.git extras = test: test From e7453e6f149db690f475574d703fa22edc25966d Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:33:36 -0500 Subject: [PATCH 2/2] Fix typo in MANIFEST MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Brigitta Sipőcz --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 0474c00..1637fde 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,7 @@ include CHANGES.rst include LICENSE.rst include setup.cfg -inckude pyproject.toml +include pyproject.toml exclude *.pyc *.o prune build