From 4e4330fd87f08ddfb23e0ec77d6d505603a09e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 10 Jul 2024 16:32:51 -0700 Subject: [PATCH 1/5] Update distributions for deb release. * Drop Ubuntu Bionic * Add Ubuntu Jammy * Add Ubuntu Noble * Drop Debian Stretch * Drop Debian Buster * Add Debian Bookworm * Add Debian Trixie --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index 4bf889a..2606337 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,5 @@ [rosdoc2] No-Python2: Depends3: python3-breathe, python3-catkin-pkg-modules, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-pyyaml, doxygen -Suite: bionic focal stretch buster +Suite: focal jammy noble bookworm trixie X-Python3-Version: >= 3.6 From 8525d353d057e5a892dbf8b645a811f9637be4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 10 Jul 2024 16:34:03 -0700 Subject: [PATCH 2/5] Update pyyaml package name. The debian package for pyyaml is python3-yaml. --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index 2606337..3c667e5 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,5 @@ [rosdoc2] No-Python2: -Depends3: python3-breathe, python3-catkin-pkg-modules, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-pyyaml, doxygen +Depends3: python3-breathe, python3-catkin-pkg-modules, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-yaml, doxygen Suite: focal jammy noble bookworm trixie X-Python3-Version: >= 3.6 From b56f1b5e95a68619acab3bb33d64e623176ba70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 10 Jul 2024 16:35:06 -0700 Subject: [PATCH 3/5] Ignore deb_dist contents. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1c1874d..3c72ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ __pycache__/ env/ build/ !rosdoc2/verbs/build +deb_dist/ develop-eggs/ dist/ downloads/ From efb5e2dc657ba36863881cbc61d7ebdbfd0071da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Wed, 10 Jul 2024 16:46:11 -0700 Subject: [PATCH 4/5] Add additional dependencies from setup.cfg. This is an attempt to square up dependencies between stdeb.cfg and setup.cfg. This presents a problem for platform support since some packages like myst-parser and exhale are not available on Ubuntu Focal. Therefore, we have to drop focal in order to package rosdoc2. --- stdeb.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdeb.cfg b/stdeb.cfg index 3c667e5..ce5a553 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,5 @@ [rosdoc2] No-Python2: -Depends3: python3-breathe, python3-catkin-pkg-modules, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-yaml, doxygen -Suite: focal jammy noble bookworm trixie +Depends3: python3-breathe, python3-catkin-pkg-modules, python3-exhale, python3-jinja2, python3-myst-parser, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-sphinx-rtd-theme, python3-yaml, doxygen +Suite: jammy noble bookworm trixie X-Python3-Version: >= 3.6 From 2178264f2cf9b2751c54db49ce388d471a58d4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 11 Jul 2024 11:31:35 -0700 Subject: [PATCH 5/5] Add graphviz dependency. It can be used by sphinx documentation in packages. In the future, it may make sense to support this as an optional dependency and require packages which make use of it to add an explicit doc-depend. --- stdeb.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdeb.cfg b/stdeb.cfg index ce5a553..d4ee4a7 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,5 @@ [rosdoc2] No-Python2: -Depends3: python3-breathe, python3-catkin-pkg-modules, python3-exhale, python3-jinja2, python3-myst-parser, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-sphinx-rtd-theme, python3-yaml, doxygen +Depends3: python3-breathe, python3-catkin-pkg-modules, python3-exhale, python3-jinja2, python3-myst-parser, python3-osrf-pycommon, python3-setuptools, python3-sphinx, python3-sphinx-rtd-theme, python3-yaml, doxygen, grapviz Suite: jammy noble bookworm trixie X-Python3-Version: >= 3.6