Skip to content

Commit 907b1d7

Browse files
committed
use py312 to build docs
1 parent 72f3e41 commit 907b1d7

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- name: Set up Python
128128
uses: actions/setup-python@v5
129129
with:
130-
python-version: "3.10"
130+
python-version: "3.12"
131131
- name: Build documentation
132132
run: |
133133
pipx run tox -e docs

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-22.04
1111
tools:
12-
python: "3.10"
12+
python: "3.12"
1313

1414
# Build documentation in the docs/ directory with Sphinx
1515
sphinx:

doc/development.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ The unit tests can be run with::
4848

4949
The documentation can be built with::
5050

51-
pip install -r doc/doc-requirements.txt
52-
python -m sphinx -an doc build
51+
pipx run tox -e docs
5352

5453
The linters can be run with::
5554

doc/scripts.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ Command line help, called with ``--help``:
1212

1313

1414
.. command-output:: python -m can.logger -h
15+
:shell:
1516

1617

1718
can.player
1819
----------
1920

2021
.. command-output:: python -m can.player -h
22+
:shell:
2123

2224

2325
can.viewer
@@ -52,9 +54,11 @@ By default the ``can.viewer`` uses the :doc:`/interfaces/socketcan` interface. A
5254
The full usage page can be seen below:
5355

5456
.. command-output:: python -m can.viewer -h
57+
:shell:
5558

5659

5760
can.logconvert
5861
--------------
5962

6063
.. command-output:: python -m can.logconvert -h
64+
:shell:

tox.ini

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@ passenv =
3030
TEST_SOCKETCAN
3131

3232
[testenv:docs]
33+
description = Build and test the documentation
34+
basepython = py312
3335
deps =
3436
-r doc/doc-requirements.txt
37+
gs-usb
3538

3639
extras =
3740
canalystii
38-
gs_usb
3941

4042
commands =
41-
python -m sphinx -an doc build
43+
python -m sphinx -b html -Wan --keep-going doc build
44+
python -m sphinx -b doctest -W --keep-going doc build
4245

4346

4447
[pytest]

0 commit comments

Comments
 (0)