fix: python3-toml is now a DebOps dependency

(cherry picked from commit 2fa8c36) (cherry picked from commit 38e7f25)
debops · Oct 13, 2021 · 8d90dd4 · 8d90dd4
1 parent f30e030
commit 8d90dd4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -30,7 +30,8 @@ General
 
 - New Jinja filters ``from_toml`` and ``to_toml`` are available to DebOps
   roles, provided using a custom Ansible plugin. The filters require the
-  ``toml`` Python package to be installed on the Ansible Controller.
+  ``toml`` Python package to be installed on the Ansible Controller. The
+  package has been included as the ``debops`` Python package dependency.
 
 :ref:`debops.apache` role
 '''''''''''''''''''''''''

diff --git a/Dockerfile b/Dockerfile
@@ -27,14 +27,15 @@ RUN apt-get -q update \
        levee \
        openssh-client \
        python3-apt \
+       python3-cryptography \
        python3-distro \
        python3-dnspython \
        python3-future \
        python3-ldap \
        python3-pip \
-       python3-wheel \
        python3-setuptools \
-       python3-cryptography \
+       python3-toml \
+       python3-wheel \
        procps \
        sudo \
        tree \

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -113,13 +113,20 @@ Ansible:
 
 .. __: https://bitbucket.org/ecollins/passlib/wiki/Home
 
+`toml`__
+  This is a Python library which is used by the DebOps custom Jinja filters
+  ``from_toml`` and ``to_toml`` which are used by some roles that configure
+  software using TOML as configuration data format.
+
+.. __: https://github.com/uiri/toml
+
 You can install them using your distribution packages on Debian or
 Ubuntu by running the command:
 
 .. code-block:: console
 
    sudo apt install python3-future python3-ldap python3-netaddr \
-                    python3-dnspython python3-passlib
+                    python3-dnspython python3-passlib python3-toml
 
 The missing Python dependencies will be automatically installed with the
 ``ansible`` and ``debops`` Python packages, however some of them, like the

diff --git a/Vagrantfile b/Vagrantfile
@@ -410,6 +410,7 @@ EOF
         python3-setuptools \
         python3-sphinx \
         python3-sphinx-rtd-theme \
+        python3-toml \
         python3-unittest2 \
         python3-wheel \
         python3-yaml \