Merge branch 'release/1.4.3'

lueschem · Apr 4, 2020 · 2dc9f04 · 2dc9f04
2 parents 58373cf + 5a89803
commit 2dc9f04
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+edi (1.4.3) bionic; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Document packages as list instead of dictionary.
+
+ -- Matthias Luescher <lueschem@gmail.com>  Sat, 04 Apr 2020 22:56:46 +0200
+
 edi (1.4.2) bionic; 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.4.2'
-release = '1.4.2'
+version = '1.4.3'
+release = '1.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

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.4.2'
+edi_fallback_version = '1.4.3'
 
 
 def get_edi_version():

diff --git a/edi/plugins/playbooks/debian/base_system_cleanup/roles/document_artifact/defaults/main.yml b/edi/plugins/playbooks/debian/base_system_cleanup/roles/document_artifact/defaults/main.yml
@@ -2,6 +2,6 @@
 document_build_setup: False
 document_installed_packages: False
 documentation_directory: /usr/share/doc/edi
-package_documentation_command: "dpkg-query --show --showformat='${Package}:\n    architecture: ${Architecture}\n    version: \"${Version}\"\n    source_package: ${source:Package}\n    status: ${db:Status-Abbrev}\n'"
+package_documentation_command: "dpkg-query --show --showformat='- package: ${Package}\n  architecture: ${Architecture}\n  version: \"${Version}\"\n  source_package: ${source:Package}\n  status: ${db:Status-Abbrev}\n'"
 package_documentation_file: packages.yml
 build_documentation_file: build.yml
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.4.2',
+    version='1.4.3',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,