diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index dc9c6a71..3e179046 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/.readthedocs.yml b/.readthedocs.yml index 2ef8471c..0fffdbca 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/CHANGELOG.rst b/CHANGELOG.rst index b2b0a9fd..bfde77b0 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 (`#365 `_) v1.23 ----- diff --git a/docs/conf.py b/docs/conf.py index c14bbd1e..746f53c4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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", diff --git a/docs/pages/architecture.rst b/docs/pages/architecture.rst index 2d852aba..7caf5aae 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"]; diff --git a/pycyphal/_version.py b/pycyphal/_version.py index f8514f48..a70ee395 100644 --- a/pycyphal/_version.py +++ b/pycyphal/_version.py @@ -1 +1 @@ -__version__ = "1.24.1" +__version__ = "1.24.2"