Merge branch 'release/1.16.1'

.github/workflows/package-build.yml

@@ -31,7 +31,7 @@ jobs:
            repository_type: launchpad
     steps:
       - name: Check out the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: Create secrets folder.
@@ -44,7 +44,7 @@ jobs:
           LAUNCHPAD_SIGNING_KEY_PASSPHRASE_BASE64: ${{ secrets.LAUNCHPAD_SIGNING_KEY_PASSPHRASE_BASE64 }}
         if: matrix.repository_type == 'launchpad'
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

debian/changelog

@@ -1,3 +1,15 @@
+edi (1.16.1) mantic; urgency=medium
+
+  [ Matthias Luescher ]
+  * Upgraded checkout and docker login actions.
+  * Added introspection tests for new commands.
+  * Removed unused code.
+  * Fixed local setup for newer argcomplete versions.
+  * Fixed build output.
+  * Added edi_host_architecture to load time dictionary.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Fri, 01 Mar 2024 11:20:03 +0100
+
 edi (1.16.0) jammy; urgency=medium
 
   [ Matthias Luescher ]

docs/conf.py

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

edi/commands/projectcommands/configure.py

@@ -82,7 +82,7 @@ def _run(self):
                                                 "configure", "prepare")
 
             print(f"Going to create project container '{container_name}'\n"
-                  f"based on content of '{bootstrapped_rootfs}'.")
+                  f"based on content of '{bootstrapped_rootfs.location}'.")
             create_container(container_name, bootstrapped_rootfs.location)
 
         seal_file = self._get_seal_artifact().location

edi/lib/configurationparser.py

@@ -375,6 +375,7 @@ def _get_load_time_dictionary(self):
         load_dict["edi_project_plugin_directory"] = self.get_project_plugin_directory()
         load_dict['edi_log_level'] = logging.getLevelName(logging.getLogger().getEffectiveLevel())
         load_dict['edi_configuration_name'] = self.get_configuration_name()
+        load_dict['edi_host_architecture'] = get_debian_architecture()
         load_dict.update(ConfigurationParser.command_context)
         return load_dict
 

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

local_setup

@@ -56,5 +56,10 @@ then
 fi
 
 # enable bash completion
-eval "$(register-python-argcomplete3 edi)"
-
+if command -v register-python-argcomplete3 > /dev/null
+then
+    eval "$(register-python-argcomplete3 edi)"
+else
+    # python3-argcomplete >= 2.0
+    eval "$(register-python-argcomplete edi)"
+fi

setup.py

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

tests/commands/introspection/test_config.py

@@ -36,6 +36,9 @@
 from edi.commands.lxccommands.publish import Publish
 from edi.commands.lxccommands.stop import Stop
 from edi.commands.targetcommands.targetconfigure import Configure as TargetConfigure
+from edi.commands.projectcommands.prepare import Prepare as ProjectPrepare
+from edi.commands.projectcommands.configure import Configure as ProjectConfigure
+from edi.commands.projectcommands.make import Make
 from edi.lib.shellhelpers import mockablerun
 
 
@@ -51,6 +54,9 @@
     (Publish, ['lxc', 'publish', '--config']),
     (Stop, ['lxc', 'stop', '--config']),
     (TargetConfigure, ['target', 'configure', '--config', '1.2.3.4']),
+    (ProjectPrepare, ['project', 'prepare', '--config']),
+    (ProjectConfigure, ['project', 'configure', '--config']),
+    (Make, ['project', 'make', '--config']),
 ])
 def test_config(monkeypatch, config_files, capsys, command, command_args):
     def fake_lxc_config_command(*popenargs, **kwargs):

tests/commands/introspection/test_dictionary.py

@@ -37,6 +37,9 @@
 from edi.commands.lxccommands.publish import Publish
 from edi.commands.lxccommands.stop import Stop
 from edi.commands.targetcommands.targetconfigure import Configure as TargetConfigure
+from edi.commands.projectcommands.prepare import Prepare as ProjectPrepare
+from edi.commands.projectcommands.configure import Configure as ProjectConfigure
+from edi.commands.projectcommands.make import Make
 from edi.lib.shellhelpers import mockablerun
 
 
@@ -52,6 +55,9 @@
     (Publish, ['lxc', 'publish', '--dictionary']),
     (Stop, ['lxc', 'stop', '--dictionary']),
     (TargetConfigure, ['target', 'configure', '--dictionary', '1.2.3.4']),
+    (ProjectPrepare, ['project', 'prepare', '--dictionary']),
+    (ProjectConfigure, ['project', 'configure', '--dictionary']),
+    (Make, ['project', 'make', '--dictionary']),
 ])
 def test_dictionary(monkeypatch, config_files, capsys, command, command_args):
     def fake_lxc_config_command(*popenargs, **kwargs):

tests/commands/introspection/test_plugins.py

@@ -38,6 +38,9 @@
 from edi.commands.lxccommands.stop import Stop
 from edi.commands.documentationcommands.render import Render
 from edi.commands.targetcommands.targetconfigure import Configure as TargetConfigure
+from edi.commands.projectcommands.prepare import Prepare as ProjectPrepare
+from edi.commands.projectcommands.configure import Configure as ProjectConfigure
+from edi.commands.projectcommands.make import Make
 from edi.lib.shellhelpers import mockablerun
 from tests.libtesting.contextmanagers.mocked_executable import mocked_executable, mocked_lxd_version_check
 
@@ -56,6 +59,9 @@
     (Stop, ['lxc', 'stop', '--plugins'], True, True, True, False),
     (TargetConfigure, ['target', 'configure', '--plugins', '1.2.3.4'], False, False, True, False),
     (Render, ['documentation', 'render', '--plugins', './', './'], False, False, False, False),
+    (ProjectPrepare, ['project', 'prepare', '--plugins'], False, False, False, False,),
+    (ProjectConfigure, ['project', 'configure', '--plugins'], False, False, True, False),
+    (Make, ['project', 'make', '--plugins'], False, False, True, True),
 ])
 def test_plugins(monkeypatch, config_files, capsys, command, command_args, has_templates,
                  has_profiles, has_playbooks, has_postprocessing_commands):