File tree 5 files changed +23
-19
lines changed
5 files changed +23
-19
lines changed Original file line number Diff line number Diff line change @@ -35,18 +35,14 @@ jobs:
35
35
with :
36
36
python-version : ${{ matrix.python-version }}
37
37
allow-prereleases : true
38
- - name : Install dependencies
39
- run : |
40
- python -m pip install --upgrade pip
41
- pip install tox
42
38
- name : Setup SocketCAN
43
39
if : ${{ matrix.os == 'ubuntu-latest' }}
44
40
run : |
45
41
sudo apt-get -y install linux-modules-extra-$(uname -r)
46
42
sudo ./test/open_vcan.sh
47
43
- name : Test with pytest via tox
48
44
run : |
49
- tox -e gh
45
+ pipx run tox -e gh
50
46
env :
51
47
# SocketCAN tests currently fail with PyPy because it does not support raw CAN sockets
52
48
# See: https://foss.heptapod.net/pypy/pypy/-/issues/3809
@@ -131,18 +127,10 @@ jobs:
131
127
- name : Set up Python
132
128
uses : actions/setup-python@v5
133
129
with :
134
- python-version : " 3.10"
135
- - name : Install dependencies
136
- run : |
137
- python -m pip install --upgrade pip
138
- pip install -e .[canalystii,gs_usb,mf4]
139
- pip install -r doc/doc-requirements.txt
130
+ python-version : " 3.12"
140
131
- name : Build documentation
141
132
run : |
142
- python -m sphinx -Wan --keep-going doc build
143
- - name : Run doctest
144
- run : |
145
- python -m sphinx -b doctest -W --keep-going doc build
133
+ pipx run tox -e docs
146
134
147
135
build :
148
136
name : Packaging
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ version: 2
9
9
build :
10
10
os : ubuntu-22.04
11
11
tools :
12
- python : " 3.10 "
12
+ python : " 3.12 "
13
13
14
14
# Build documentation in the docs/ directory with Sphinx
15
15
sphinx :
Original file line number Diff line number Diff line change @@ -48,8 +48,7 @@ The unit tests can be run with::
48
48
49
49
The documentation can be built with::
50
50
51
- pip install -r doc/doc-requirements.txt
52
- python -m sphinx -an doc build
51
+ pipx run tox -e docs
53
52
54
53
The linters can be run with::
55
54
Original file line number Diff line number Diff line change @@ -12,12 +12,14 @@ Command line help, called with ``--help``:
12
12
13
13
14
14
.. command-output :: python -m can.logger -h
15
+ :shell:
15
16
16
17
17
18
can.player
18
19
----------
19
20
20
21
.. command-output :: python -m can.player -h
22
+ :shell:
21
23
22
24
23
25
can.viewer
@@ -52,9 +54,11 @@ By default the ``can.viewer`` uses the :doc:`/interfaces/socketcan` interface. A
52
54
The full usage page can be seen below:
53
55
54
56
.. command-output :: python -m can.viewer -h
57
+ :shell:
55
58
56
59
57
60
can.logconvert
58
61
--------------
59
62
60
63
.. command-output :: python -m can.logconvert -h
64
+ :shell:
Original file line number Diff line number Diff line change 1
1
[tox]
2
- isolated_build = true
3
2
4
3
[testenv]
5
4
deps =
@@ -30,6 +29,20 @@ passenv =
30
29
PY_COLORS
31
30
TEST_SOCKETCAN
32
31
32
+ [testenv:docs]
33
+ description = Build and test the documentation
34
+ basepython = py312
35
+ deps =
36
+ -r doc/doc-requirements.txt
37
+ gs-usb
38
+
39
+ extras =
40
+ canalystii
41
+
42
+ commands =
43
+ python -m sphinx -b html -Wan --keep-going doc build
44
+ python -m sphinx -b doctest -W --keep-going doc build
45
+
33
46
34
47
[pytest]
35
48
testpaths = test
You can’t perform that action at this time.
0 commit comments