From c6272b8a8e49fba6929c32d2cb896bb6500bd691 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Wed, 7 Jun 2023 13:32:20 -0400 Subject: [PATCH 1/2] Use older Python to build wheel --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9f87994..a8f5379 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.8" - name: Install build dependencies run: python -m pip install pip build "twine>=3.3" -U From bee5b240934d2519dde1436b07774ad3e39ab7cc Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:31:25 -0400 Subject: [PATCH 2/2] BUG: Fix install for older Python by changing v2 to confv2 in extras_require --- CHANGES.rst | 7 +++++-- README.rst | 8 ++++---- setup.cfg | 2 +- tox.ini | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 03dd175..3a0b618 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,8 +1,11 @@ Changes in sphinx-astropy ========================= -2.0 (unreleased) ----------------- +1.9.1 (2023-06-07) +------------------ + +- Renamed ``[v2]`` optional dependencies key to ``[confv2]`` + to avoid triggering build error in Python 3.10 or earlier. [#63] 1.9 (2023-06-06) ---------------- diff --git a/README.rst b/README.rst index 93f72a1..4e4f655 100644 --- a/README.rst +++ b/README.rst @@ -50,13 +50,13 @@ Installing **sphinx-astropy** will automatically install (if not already present * `pytest-doctestplus `_ - providing the 'doctestplus' extension to skip code snippets in narrative documentation. -pydata-sphinx-theme (v2) -^^^^^^^^^^^^^^^^^^^^^^^^ +pydata-sphinx-theme (confv2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ To use the new `pydata-sphinx-theme` with `sphinx_astropy.conf.v2`, you have to install -the optional `[v2]` dependencies:: +the optional `[confv2]` dependencies:: - pip install sphinx-astropy[v2] + pip install sphinx-astropy[confv2] That would pull in the following as well: diff --git a/setup.cfg b/setup.cfg index 791eb8c..7ebcd68 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ install_requires = pytest-doctestplus>=0.11 [options.extras_require] -v2 = +confv2 = pydata-sphinx-theme sphinx-copybutton all = astropy diff --git a/tox.ini b/tox.ini index 11f669f..f642d32 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ changedir = .tmp/{envname} description = run tests extras = tests - v2deps: v2 + v2deps: confv2 deps = sphinx30: sphinx==3.0.* sphinx30: docutils==0.17.*