Skip to content

Commit fd3ed36

Browse files
Merge pull request #104 from lsst/tickets/DM-54031
DM-54031: Bump minimum Python version to 3.12 and update docs action to sphinxutils.
2 parents 59d1ae4 + 7398afd commit fd3ed36

8 files changed

Lines changed: 34 additions & 26 deletions

File tree

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: ["3.11", "3.12", "3.13", "3.14"]
16+
python-version: ["3.12", "3.13", "3.14"]
1717

1818
steps:
1919
- uses: actions/checkout@v6

.github/workflows/build_docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Python
1919
uses: actions/setup-python@v6
2020
with:
21-
python-version: '3.11'
21+
python-version: '3.13'
2222
cache: "pip"
2323
cache-dependency-path: "setup.cfg"
2424

@@ -36,8 +36,8 @@ jobs:
3636
run: uv pip install --system --no-deps -v .
3737

3838
- name: Install documenteer
39-
run: uv pip install --system 'documenteer[pipelines]==0.8.2' sphinx-automodapi==0.19
39+
run: uv pip install --system -r doc/requirements.txt
4040

4141
- name: Build documentation
4242
working-directory: ./doc
43-
run: package-docs build -n
43+
run: package-docs build -n -W

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ pytest_session.txt
2121
.pytest_cache
2222
.coverage
2323
python/*.dist-info/
24+
doc/api

doc/changes/DM-54031.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed unused ``isort`` and ``black`` sections from ``pyproject.toml``. Bumped minimum Python version to 3.12. Switched docs action to use ``sphinxutils``.

doc/conf.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@
22
33
This configuration only affects single-package Sphinx documentation builds.
44
"""
5+
# ruff: noqa: F403, F405
56

6-
from documenteer.conf.pipelinespkg import * # noqa: F403, import *
7+
from documenteer.conf.guide import *
78

8-
project = "ctrl_bps_panda"
9-
html_theme_options["logotext"] = project # noqa: F405, unknown name
10-
html_title = project
11-
html_short_title = project
12-
doxylink = {}
13-
exclude_patterns = ["changes/*"]
14-
15-
# Try to pull in links for butler and pipe_base.
16-
intersphinx_mapping["lsst"] = ("https://pipelines.lsst.io/v/daily/", None) # noqa
9+
exclude_patterns.append("changes/*")

doc/documenteer.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[project]
2+
title = "lsst-ctrl-bps-panda"
3+
4+
[project.python]
5+
package = "lsst-ctrl-bps-panda"
6+
7+
[build]
8+
clean = true
9+
10+
[sphinx]
11+
extensions = [
12+
"sphinx_click"
13+
]
14+
15+
[sphinx.intersphinx.projects]
16+
python = "https://docs.python.org/3"
17+
lsst = "https://pipelines.lsst.io/v/daily/"
18+
networkx = "https://networkx.org/documentation/stable/"

doc/requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
documenteer[guide] > 2.0, <3.0
2+
lsst-sphinxutils @ git+https://github.com/lsst/sphinxutils@main
3+
sphinx-click

pyproject.toml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "lsst-ctrl-bps-panda"
7-
requires-python = ">=3.11.0"
7+
requires-python = ">=3.12.0"
88
description = "PanDA plugin for lsst-ctrl-bps."
99
license = "BSD-3-Clause OR GPL-3.0-or-later"
1010
license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
@@ -16,7 +16,6 @@ classifiers = [
1616
"Intended Audience :: Science/Research",
1717
"Operating System :: OS Independent",
1818
"Programming Language :: Python :: 3",
19-
"Programming Language :: Python :: 3.11",
2019
"Programming Language :: Python :: 3.12",
2120
"Programming Language :: Python :: 3.13",
2221
"Programming Language :: Python :: 3.14",
@@ -40,6 +39,7 @@ dependencies = [
4039
dynamic = ["version"]
4140
[project.urls]
4241
"Homepage" = "https://github.com/lsst/ctrl_bps_panda"
42+
"Source" = "https://github.com/lsst/ctrl_bps_panda"
4343

4444
[project.optional-dependencies]
4545
test = [
@@ -97,15 +97,6 @@ version = { attr = "lsst_versions.get_lsst_version" }
9797
name = "An API Removal or Deprecation"
9898
showcontent = true
9999

100-
[tool.black]
101-
line-length = 110
102-
target-version = ["py311"]
103-
104-
[tool.isort]
105-
profile = "black"
106-
line_length = 110
107-
known_first_party = ["lsst"]
108-
109100
[tool.lsst_versions]
110101
write_to = "python/lsst/ctrl/bps/panda/version.py"
111102

@@ -124,7 +115,7 @@ add-ignore = ["D107", "D105", "D102", "D100", "D200", "D205", "D400", "D104"]
124115

125116
[tool.ruff]
126117
line-length = 110
127-
target-version = "py311"
118+
target-version = "py312"
128119
exclude = [
129120
"__init__.py",
130121
]
@@ -188,6 +179,7 @@ checks = [
188179
"RT01", # Unfortunately our @property trigger this.
189180
"RT02", # Does not want named return value. DM style says we do.
190181
"SS05", # pydocstyle is better at finding infinitive verb.
182+
"RT03", # Temporarily disable for sphinx empty returns.
191183
]
192184
exclude = [
193185
'^__init__$',

0 commit comments

Comments
 (0)