Skip to content
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
17 changes: 0 additions & 17 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ v1.24
- Install Graphviz 13.x.
See (`#363 <https://github.com/OpenCyphal/pycyphal/pull/363>`_)

- **v1.24.2:**

- Revert changes from 1.24.1. See Issue (`#321 <https://github.com/OpenCyphal/pycyphal/issues/321>`_)
- Build Graphviz 13.x.
See (`#365 <https://github.com/OpenCyphal/pycyphal/pull/365>`_)

v1.23
-----
Expand Down
2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
todo_include_todos = True

graphviz_output_format = "svg"
if os.environ.get("READTHEDOCS_VIRTUALENV_PATH"):
graphviz_dot = os.path.expanduser("~/.graphviz/bin/dot")

inheritance_graph_attrs = {
"rankdir": "LR",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion pycyphal/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.24.1"
__version__ = "1.24.2"