From 9bce60fb982a92cb5fa8d9ae818f2215858a3f5c Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Wed, 16 Jul 2025 16:51:37 +0300 Subject: [PATCH 1/9] fix css for inheritance diagramsize --- docs/static/custom.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/static/custom.css b/docs/static/custom.css index 60a73ec7d..ff2971774 100644 --- a/docs/static/custom.css +++ b/docs/static/custom.css @@ -1,3 +1,12 @@ +/* See https://github.com/OpenCyphal/pycyphal/issues/321 */ +object.inheritance, img.inheritance { + max-width: 25%; + width: 25%; + height: auto; + display: block; + margin: auto; +} + /* Gray text is ugly. Text should be black. */ body { color: #000; From d407ada918c04be0ea2467250be8862033db04fa Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Wed, 16 Jul 2025 23:36:49 +0300 Subject: [PATCH 2/9] try to build graphviz 13.x again --- .readthedocs.yml | 9 ++++++++- docs/conf.py | 1 + docs/static/custom.css | 9 --------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3eb12a812..868b524d2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -7,7 +7,14 @@ build: tools: python: "3.10" apt_packages: - - graphviz + - build-essential + - libsodium-dev + - libargon2-dev + jobs: + pre_create_environment: + - wget https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/13.1.0/graphviz-13.1.0.tar.gz + - tar xzf graphviz-13.1.0.tar.gz + - cd ./graphviz-13.1.0 && ./configure -prefix=$HOME/.graphviz --disable-perl --disable-python --disable-go --disable-java --disable-lua --disable-tcl && make install sphinx: configuration: docs/conf.py diff --git a/docs/conf.py b/docs/conf.py index c14bbd1e9..72caae32f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -107,6 +107,7 @@ todo_include_todos = True graphviz_output_format = "svg" +graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") inheritance_graph_attrs = { "rankdir": "LR", diff --git a/docs/static/custom.css b/docs/static/custom.css index ff2971774..60a73ec7d 100644 --- a/docs/static/custom.css +++ b/docs/static/custom.css @@ -1,12 +1,3 @@ -/* See https://github.com/OpenCyphal/pycyphal/issues/321 */ -object.inheritance, img.inheritance { - max-width: 25%; - width: 25%; - height: auto; - display: block; - margin: auto; -} - /* Gray text is ugly. Text should be black. */ body { color: #000; From 9cc2cedc6166df1d47baac77779aa545496bd4bd Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Thu, 17 Jul 2025 14:07:50 +0300 Subject: [PATCH 3/9] add the environment check --- docs/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 72caae32f..746f53c4c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -107,7 +107,8 @@ todo_include_todos = True graphviz_output_format = "svg" -graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") +if os.environ.get("READTHEDOCS_VIRTUALENV_PATH"): + graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") inheritance_graph_attrs = { "rankdir": "LR", From 917182a99a719bd1dba96a6ee8859e5c04f99e40 Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Thu, 17 Jul 2025 14:15:20 +0300 Subject: [PATCH 4/9] remove font issue --- docs/pages/architecture.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/architecture.rst b/docs/pages/architecture.rst index 2d852abae..7caf5aaec 100644 --- a/docs/pages/architecture.rst +++ b/docs/pages/architecture.rst @@ -54,7 +54,7 @@ The dependency relations of the submodules are as follows: digraph submodule_interdependency { graph [bgcolor=transparent]; - node [shape=box, style=filled, fontname="monospace"]; + node [shape=box, style=filled]; dsdl [fillcolor="#FF88FF", label="pycyphal.dsdl"]; transport [fillcolor="#FFF2CC", label="pycyphal.transport"]; From fa74012ba107126587a3cf02dee5ac89ce20ef54 Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Wed, 16 Jul 2025 16:51:37 +0300 Subject: [PATCH 5/9] fix css for inheritance diagramsize --- docs/static/custom.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/static/custom.css b/docs/static/custom.css index 60a73ec7d..ff2971774 100644 --- a/docs/static/custom.css +++ b/docs/static/custom.css @@ -1,3 +1,12 @@ +/* See https://github.com/OpenCyphal/pycyphal/issues/321 */ +object.inheritance, img.inheritance { + max-width: 25%; + width: 25%; + height: auto; + display: block; + margin: auto; +} + /* Gray text is ugly. Text should be black. */ body { color: #000; From d3e02075a07d3a34b53f75cc603ae3c916a24b5e Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Wed, 16 Jul 2025 23:36:49 +0300 Subject: [PATCH 6/9] try to build graphviz 13.x again --- .readthedocs.yml | 9 ++++++++- docs/conf.py | 1 + docs/static/custom.css | 9 --------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 2ef8471cb..0fffdbcac 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -7,7 +7,14 @@ build: tools: python: "3.10" apt_packages: - - graphviz + - build-essential + - libsodium-dev + - libargon2-dev + jobs: + pre_create_environment: + - wget https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/13.1.0/graphviz-13.1.0.tar.gz + - tar xzf graphviz-13.1.0.tar.gz + - cd ./graphviz-13.1.0 && ./configure -prefix=$HOME/.graphviz --disable-perl --disable-python --disable-go --disable-java --disable-lua --disable-tcl && make install sphinx: configuration: docs/conf.py diff --git a/docs/conf.py b/docs/conf.py index c14bbd1e9..72caae32f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -107,6 +107,7 @@ todo_include_todos = True graphviz_output_format = "svg" +graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") inheritance_graph_attrs = { "rankdir": "LR", diff --git a/docs/static/custom.css b/docs/static/custom.css index ff2971774..60a73ec7d 100644 --- a/docs/static/custom.css +++ b/docs/static/custom.css @@ -1,12 +1,3 @@ -/* See https://github.com/OpenCyphal/pycyphal/issues/321 */ -object.inheritance, img.inheritance { - max-width: 25%; - width: 25%; - height: auto; - display: block; - margin: auto; -} - /* Gray text is ugly. Text should be black. */ body { color: #000; From 52d55b850b533246c8787d47a55201028aa67fb9 Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Thu, 17 Jul 2025 14:07:50 +0300 Subject: [PATCH 7/9] add the environment check --- docs/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 72caae32f..746f53c4c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -107,7 +107,8 @@ todo_include_todos = True graphviz_output_format = "svg" -graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") +if os.environ.get("READTHEDOCS_VIRTUALENV_PATH"): + graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot") inheritance_graph_attrs = { "rankdir": "LR", From ebdaa5cb21fa73b23c8e48c379a0f1929197bb54 Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Thu, 17 Jul 2025 14:15:20 +0300 Subject: [PATCH 8/9] remove font issue --- docs/pages/architecture.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/architecture.rst b/docs/pages/architecture.rst index 2d852abae..7caf5aaec 100644 --- a/docs/pages/architecture.rst +++ b/docs/pages/architecture.rst @@ -54,7 +54,7 @@ The dependency relations of the submodules are as follows: digraph submodule_interdependency { graph [bgcolor=transparent]; - node [shape=box, style=filled, fontname="monospace"]; + node [shape=box, style=filled]; dsdl [fillcolor="#FF88FF", label="pycyphal.dsdl"]; transport [fillcolor="#FFF2CC", label="pycyphal.transport"]; From 4cbf04201dba1289176c1bef353d6f26c8b72a5c Mon Sep 17 00:00:00 2001 From: Huong Pham Date: Thu, 17 Jul 2025 14:28:22 +0300 Subject: [PATCH 9/9] revert prev commit change, bump patch version, add changelog --- .github/workflows/test-and-release.yml | 17 ----------------- CHANGELOG.rst | 5 +++++ pycyphal/_version.py | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index dc9c6a713..3e1790468 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -50,14 +50,6 @@ jobs: python --version ip link show - # Install Graphviz 13.x - wget https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/13.1.0/ubuntu_24.04_graphviz-13.1.0-cmake.deb - sudo sudo dpkg -i ./ubuntu_24.04_graphviz-13.1.0-cmake.deb - - # Check Graphviz version - dot -V - which dot - - name: Configure environment -- Windows if: ${{ runner.os == 'Windows' }} run: | @@ -96,15 +88,6 @@ jobs: python -m pip install --upgrade pip packaging setuptools wheel twine python setup.py sdist bdist_wheel - - name: Install Graphviz 13.x - run: | - wget https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/13.1.0/ubuntu_24.04_graphviz-13.1.0-cmake.deb - sudo sudo dpkg -i ./ubuntu_24.04_graphviz-13.1.0-cmake.deb - - # Check Graphviz version - dot -V - which dot - - name: Get release version run: | cd pycyphal diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b2b0a9fd1..3dd50fa84 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,11 @@ v1.24 - Install Graphviz 13.x. See (`#363 `_) +- **v1.24.2:** + + - Revert changes from 1.24.1. See Issue (`#321 `_) + - Build Graphviz 13.x. + See (`#363 `_) v1.23 ----- diff --git a/pycyphal/_version.py b/pycyphal/_version.py index f8514f48f..a70ee3955 100644 --- a/pycyphal/_version.py +++ b/pycyphal/_version.py @@ -1 +1 @@ -__version__ = "1.24.1" +__version__ = "1.24.2"