Merge branch 'release/1.4.2'

debian/changelog

@@ -1,3 +1,10 @@
+edi (1.4.2) bionic; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Renamed recently introduced document_packages to document_installed_packages.
+
+ -- Matthias Luescher <matthias.luescher@schindler.com>  Thu, 02 Apr 2020 12:06:27 +0200
+
 edi (1.4.1) bionic; urgency=medium
 
   [ Matthias Lüscher ]

docs/conf.py

@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4.1'
-release = '1.4.1'
+version = '1.4.2'
+release = '1.4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/config_management/plugins.rst

@@ -297,7 +297,7 @@ The playbook can be fine tuned as follows:
      To document the build setup of the artifact within the artifact set this value to :code:`True`.
      As a result the file :code:`/usr/share/doc/edi/build.yml` will be generated. By default this feature is switched
      off (boolean value :code:`False`).
-  *document_packages:*
+  *document_installed_packages:*
      To document the packages of the artifact within the artifact set this value to :code:`True`.
      As a result the file :code:`/usr/share/doc/edi/packages.yml` will be generated. The generated file will contain a
      list of all packages including version information. It is a snapshot of the available packages after the artifact

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

edi/plugins/playbooks/debian/base_system_cleanup/main.yml

@@ -9,7 +9,7 @@
     target_socks_proxy: ""
     target_no_proxy: ""
     document_build_setup: False
-    document_packages: False
+    document_installed_packages: False
   roles:
     - role: openssh_server_keys
       become: True

edi/plugins/playbooks/debian/base_system_cleanup/roles/document_artifact/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 document_build_setup: False
-document_packages: 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_file: packages.yml

edi/plugins/playbooks/debian/base_system_cleanup/roles/document_artifact/tasks/main.yml

@@ -3,7 +3,7 @@
   file:
     dest: "{{ documentation_directory }}"
     state: directory
-  when: document_build_setup or document_packages
+  when: document_build_setup or document_installed_packages
 
 - name: Get project configuration scm revision.
   script: get_project_scm_revision {{ edi_project_directory }}
@@ -23,10 +23,10 @@
   command: "{{ package_documentation_command }}"
   register: installed_packages
   changed_when: false
-  when: document_packages
+  when: document_installed_packages
 
 - name: Write a file that documents the installed packages.
   template:
     src: packages
     dest: "{{ documentation_directory }}/{{ package_documentation_file }}"
-  when: document_packages
+  when: document_installed_packages

setup.py

@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.4.1',
+    version='1.4.2',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,