Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance fixes for Python v3.10 #263

Merged
merged 7 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions doc/bridle/known-warnings-inventory.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# Each line should contain the regular expression of a known Sphinx warning
# that should be filtered out

# Coming later from other docset
.*undefined label:.*

# Coming later from zephyr docset
.*term not in glossary: 'zephyr:.*'
.*unknown document: 'zephyr:.*'
.*undefined label: 'zephyr:.*'

# Coming later from kconfig docset
.*undefined label: 'kconfig:.*'

# Coming later from devicetree docset
.*undefined label: 'devicetree:.*'

# FIXME: Sphinx emits "toctree glob pattern %r didn't match any documents"
# instead of:
Expand Down Expand Up @@ -43,3 +39,17 @@
# reference target in: bridle/doc/bridle/gs_installing.rst:89
#
.*Duplicate explicit target name: "install_dependencies_windows"\.

#
# TODO: is ".. _cytron_maker_nano_rp2040:"
# or ".. _cytron_maker_pi_rp2040:"
# or ".. _cytron_maker_pi_rp2040_positions:"
# inside ".. group-tab::" realy working?
#
# reference target in: bridle/boards/cytron/maker_rp2040/doc/index.rst:21
# reference target in: bridle/boards/cytron/maker_rp2040/doc/index.rst:27
# reference target in: bridle/boards/cytron/maker_rp2040/doc/index.rst:42
#
.*Duplicate explicit target name: "cytron_maker_nano_rp2040"\.
.*Duplicate explicit target name: "cytron_maker_pi_rp2040"\.
.*Duplicate explicit target name: "cytron_maker_pi_rp2040_positions"\.
2 changes: 2 additions & 0 deletions doc/bridle/releases/release-notes-3.7.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ Take over the new build principles from Zephyr:
* tbd.
* tbd.
* tbd.
* Update of the minimum requirements for Python to version 3.10.
* Update of the minimum requirements for CMake to version 3.20.5.
* Use the new upstream *MIPI DBI driver class* for all *ST7735R* based displays.
* Use the new upstream *MIPI DBI driver class* for all *ST7789V* based displays.
* Convert all Bridle *boards* and *SoCs* to the **new Hardware Model v2**.
Expand Down
6 changes: 2 additions & 4 deletions doc/devicetree/known-warnings-inventory.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Each line should contain the regular expression of a known Sphinx warning
# that should be filtered out additional to the original filter set

# Coming later from zephyr docset
.*undefined label: 'dt-guide'
.*undefined label: 'zephyr:dt-bindings'
.*undefined label: 'zephyr:dt-important-props'
# Coming later from other docset
.*undefined label:.*
4 changes: 2 additions & 2 deletions doc/kconfig/known-warnings-inventory.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Each line should contain the regular expression of a known Sphinx warning
# that should be filtered out additional to the original filter set

# Coming later from zephyr docset
.*undefined label: 'kconfig'
# Coming later from other docset
.*undefined label:.*
6 changes: 2 additions & 4 deletions doc/zephyr/known-warnings-inventory.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Each line should contain the regular expression of a known Sphinx warning
# that should be filtered out additional to the original filter set

# Coming later from devicetree docset
.*undefined label: 'devicetree_binding_index'
.*undefined label: 'dt_vendor_zephyr'
# Coming later from other docset
.*undefined label:.*

#
# TODO: New warnings with Doxygen v1.9.8 - unknown reasons.
Expand All @@ -17,7 +16,6 @@
# reference target in: zephyr/doc/develop/flash_debug/probes.rst:251
# referred to there in: zephyr/samples/bluetooth/hci_uart/README.rst:311
#
.*undefined label: 'using segger j-link'
.*Duplicate explicit target name: "using segger j-link"\.

#
Expand Down
7 changes: 7 additions & 0 deletions doc/zephyr/known-warnings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@
#
.*Error in declarator or parameters.*
.*Invalid C declaration: Expected identifier in nested name.*

# Function and (enum or struct) name
.*Duplicate C declaration.*\n.*'\.\. c:.*:: BT_.*'.*
.*Duplicate C declaration.*\n.*'\.\. c:.*:: FS_.*'.*
.*Duplicate C declaration.*\n.*'\.\. c:.*:: HID_REPORT_.*'.*
.*Duplicate C declaration.*\n.*'\.\. c:.*:: PCIE_SCAN_.*'.*
.*Duplicate C declaration.*\n.*'\.\. c:.*:: K_WORK_.*'.*
2 changes: 1 addition & 1 deletion scripts/requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ breathe>=4.35
docutils>=0.18
doxmlparser~=1.10
pygments~=2.18
sphinx~=7.1
sphinx~=7.4
sphinx-tsn-theme~=2024.1
sphinxcontrib-mscgen~=0.6
sphinxcontrib-svg2pdfconverter~=1.2
Expand Down
16 changes: 8 additions & 8 deletions scripts/tools-versions-linux.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
python3=3.8.2-0ubuntu2
git=1:2.25.1-1ubuntu3.5
cmake=3.27.7-0kitware1ubuntu20.04.1
ninja-build=1.10.0-1build1
python3=3.10.4-0ubuntu2
git=1:2.34.1-1ubuntu1.11
cmake=3.22.1-1ubuntu1.22.04.2
ninja-build=1.10.1-1
gperf=3.1-1build1
device-tree-compiler=1.5.1-1
openocd=0.11.0-5 (xPack OpenOCD from GitHub)
ccache=3.7.7-1
device-tree-compiler=1.6.1-1
openocd=0.12.0-4 (xPack OpenOCD from GitHub)
ccache=4.5.1-1
dfu-util=0.9-1
west=0.14.0
west=1.2.0
zephyr-sdk=0.16.8
armgnutc=13.2.rel1
gnuarmemb=10.3-2021.10
Expand Down
16 changes: 8 additions & 8 deletions scripts/tools-versions-macos.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
python=3.8.2;hash=b703318dd9eb7bc5e8d97c8b95e9445f754ca22f
git=2.26.2;hash=fd0766dbc0032ff22914cae6530440c48757c4e1
cmake=3.20.5
ninja=1.9.0
gperf=3.1;hash=258483ea2fd445d42d869d495504f960202fe0c3
dtc=1.4.7;hash=0747cc9d6b50ac8a3b1b576e4509494f2258aef2
openocd=0.11.0-5 (xPack OpenOCD from GitHub)
west=0.14.0
python=3.10.6
git=2.34.1
cmake=3.22.6-1 (xPack CMake from GitHub)
ninja=1.10.1-1 (xPack ninja-build from GitHub)
gperf=3.1
dtc=1.4.7
openocd=0.12.0-4 (xPack OpenOCD from GitHub)
west=1.2.0
zephyr-sdk=0.16.8
armgnutc=13.2.rel1
gnuarmemb=10.3-2021.10
Expand Down
6 changes: 3 additions & 3 deletions scripts/tools-versions-minimum.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
python=3.8
cmake=3.20
python=3.10
cmake=3.20.5
ninja=1.8.2
gperf=3.1
dtc=1.4.6
openocd=0.11
west=0.12
west=0.14
zephyr-sdk=0.16.7
armgnutc=11.2-2022.02
gnuarmemb=10-2020-q4-major
Expand Down
12 changes: 6 additions & 6 deletions scripts/tools-versions-win10.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
python=3.8.2
git=2.26.2.windows.1
cmake=3.20.5
ninja=1.9.0
python=3.10.6
git=2.34.1.windows.1
cmake=3.22.6-1 (xPack CMake from GitHub)
ninja=1.10.1-1 (xPack ninja-build from GitHub)
gperf=3.1
dtc=1.4.7-1
openocd=0.11.0-5 (xPack OpenOCD from GitHub)
west=0.14.0
openocd=0.12.0-4 (xPack OpenOCD from GitHub)
west=1.2.0
zephyr-sdk=0.16.8
armgnutc=13.2.rel1
gnuarmemb=10.3-2021.10
Expand Down