Merge branch 'release/1.9.5'

lueschem · Nov 7, 2021 · b289c83 · b289c83
2 parents 9a73b8e + d59449b
commit b289c83
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 7 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,16 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+sphinx:
+   configuration: docs/conf.py
+
+python:
+   install:
+   - requirements: docs/requirements.txt
diff --git a/README.rst b/README.rst
@@ -9,6 +9,11 @@ Embedded Development Infrastructure - edi
     :target: https://packagecloud.io/get-edi/debian
 
 
+.. image:: https://readthedocs.org/projects/edi/badge/?version=latest
+    :target: https://docs.get-edi.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
+
 Driven by the DevOps mindset edi helps you to streamline your embedded development infrastructure.
 To achieve this goal, edi leverages top-notch open source technologies:
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+edi (1.9.5) impish; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Add explicit read the docs configuration.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Sun, 07 Nov 2021 23:01:27 +0100
+
 edi (1.9.4) hirsute; urgency=medium
 
   [ Matthias Lüscher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.9.4'
-release = '1.9.4'
+version = '1.9.5'
+release = '1.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/config_management/jinja2.rst b/docs/config_management/jinja2.rst
@@ -11,7 +11,7 @@ Jinja2 will replace the expression :code:`{{ edi_configuration_name }}` with the
 The following command can be used to display the dictionary that is available for Jinja2 operations when loading
 the configuration :code:`my-project-develop.yml`:
 
-.. code:: bash
+.. code-block:: bash
 
    edi image create --dictionary my-project-develop.yml
 
@@ -21,7 +21,7 @@ all commands that deal with configuration.
 
 :code:`my-project-develop.yml` contains an even more complicated parametrization in the :code:`lxc_profiles` section:
 
-.. code:: yaml
+.. code-block::
 
    {% if edi_lxd_version is defined and (edi_lxd_version.split('.')[0] | int >= 3 or edi_lxd_version.split('.')[1] | int >= 9) %}
      200_default_root_device:
@@ -34,7 +34,7 @@ LXD versions.
 Plugins can even further benefit from Jinja2 since there are additional dictionary entries available. The option
 :code:`--plugins` will output the details:
 
-.. code:: bash
+.. code-block:: bash
 
    edi image create --plugins my-project-develop.yml
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1,3 @@
+sphinx==3.5.4
+sphinx_rtd_theme==0.5.1
+readthedocs-sphinx-search==0.1.0
diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.9.4'
+edi_fallback_version = '1.9.5'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.9.4',
+    version='1.9.5',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,