craft-application 2.1.0__tar.gz → 2.2.0__tar.gz

{craft-application-2.1.0 → craft-application-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 2.1.0
+Version: 2.2.0
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -35,7 +35,7 @@ Requires-Dist: hypothesis>=6.0; extra == "dev"
 Requires-Dist: pyfakefs~=5.3; extra == "dev"
 Requires-Dist: pytest==8.1.1; extra == "dev"
 Requires-Dist: pytest-check==2.3.1; extra == "dev"
-Requires-Dist: pytest-cov==4.1.0; extra == "dev"
+Requires-Dist: pytest-cov==5.0.0; extra == "dev"
 Requires-Dist: pytest-mock==3.12.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==13.0; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"

{craft-application-2.1.0 → craft-application-2.2.0}/craft_application/__init__.py

@@ -32,7 +32,7 @@ except ImportError:  # pragma: no cover
     from importlib.metadata import version, PackageNotFoundError
 
     try:
-        __version__ = version("craft-archives")
+        __version__ = version("craft-application")
     except PackageNotFoundError:
         __version__ = "dev"
 

{craft-application-2.1.0 → craft-application-2.2.0}/craft_application/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.0'
-__version_tuple__ = version_tuple = (2, 1, 0)
+__version__ = version = '2.2.0'
+__version_tuple__ = version_tuple = (2, 2, 0)

{craft-application-2.1.0 → craft-application-2.2.0}/craft_application/application.py

@@ -323,7 +323,10 @@ class Application:
             if build_for and build_for != build_info.build_for:
                 continue
 
-            env = {"CRAFT_PLATFORM": build_info.platform}
+            env = {
+                "CRAFT_PLATFORM": build_info.platform,
+                "CRAFT_VERBOSITY_LEVEL": craft_cli.emit.get_mode().name,
+            }
 
             if self.app.features.build_secrets:
                 # If using build secrets, put them in the environment of the managed
@@ -658,16 +661,38 @@ class Application:
         # Set the logging level to DEBUG for all craft-libraries. This is OK even if
         # the specific application doesn't use a specific library, the call does not
         # import the package.
+        emitter_mode: craft_cli.EmitterMode = craft_cli.EmitterMode.BRIEF
+        invalid_emitter_level = False
         util.setup_loggers(*self._cli_loggers)
 
+        # environment variable takes precedence over the default
+        emitter_verbosity_level_env = os.environ.get("CRAFT_VERBOSITY_LEVEL", None)
+
+        if emitter_verbosity_level_env:
+            try:
+                emitter_mode = craft_cli.EmitterMode[
+                    emitter_verbosity_level_env.strip().upper()
+                ]
+            except KeyError:
+                invalid_emitter_level = True
+
         craft_cli.emit.init(
-            mode=craft_cli.EmitterMode.BRIEF,
+            mode=emitter_mode,
             appname=self.app.name,
             greeting=f"Starting {self.app.name}, version {self.app.version}",
             log_filepath=self.log_path,
             streaming_brief=True,
         )
 
+        craft_cli.emit.debug(f"Log verbosity level set to {emitter_mode.name}")
+
+        if invalid_emitter_level:
+            craft_cli.emit.progress(
+                f"Invalid verbosity level '{emitter_verbosity_level_env}', using default 'BRIEF'.\n"
+                f"Valid levels are: {', '.join(emitter.name for emitter in craft_cli.EmitterMode)}",
+                permanent=True,
+            )
+
 
 def filter_plan(
     build_plan: list[BuildInfo],

{craft-application-2.1.0 → craft-application-2.2.0}/craft_application.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: craft-application
-Version: 2.1.0
+Version: 2.2.0
 Summary: A framework for *craft applications.
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -35,7 +35,7 @@ Requires-Dist: hypothesis>=6.0; extra == "dev"
 Requires-Dist: pyfakefs~=5.3; extra == "dev"
 Requires-Dist: pytest==8.1.1; extra == "dev"
 Requires-Dist: pytest-check==2.3.1; extra == "dev"
-Requires-Dist: pytest-cov==4.1.0; extra == "dev"
+Requires-Dist: pytest-cov==5.0.0; extra == "dev"
 Requires-Dist: pytest-mock==3.12.0; extra == "dev"
 Requires-Dist: pytest-rerunfailures==13.0; extra == "dev"
 Requires-Dist: pytest-time>=0.3.1; extra == "dev"

{craft-application-2.1.0 → craft-application-2.2.0}/craft_application.egg-info/requires.txt

@@ -22,7 +22,7 @@ hypothesis>=6.0
 pyfakefs~=5.3
 pytest==8.1.1
 pytest-check==2.3.1
-pytest-cov==4.1.0
+pytest-cov==5.0.0
 pytest-mock==3.12.0
 pytest-rerunfailures==13.0
 pytest-time>=0.3.1

{craft-application-2.1.0 → craft-application-2.2.0}/pyproject.toml

@@ -50,7 +50,7 @@ dev = [
     "pyfakefs~=5.3",
     "pytest==8.1.1",
     "pytest-check==2.3.1",
-    "pytest-cov==4.1.0",
+    "pytest-cov==5.0.0",
     "pytest-mock==3.12.0",
     "pytest-rerunfailures==13.0",
     "pytest-time>=0.3.1",

{craft-application-2.1.0 → craft-application-2.2.0}/tests/unit/test_application.py

@@ -450,6 +450,35 @@ def test_show_app_name_and_version(monkeypatch, capsys, app):
     assert f"Starting testcraft, version {app.app.version}" in err
 
 
+@pytest.mark.parametrize("verbosity", list(craft_cli.EmitterMode))
+def test_set_verbosity_from_env(monkeypatch, capsys, app, verbosity):
+    """Test that the emitter verbosity is set from the environment."""
+    monkeypatch.setattr(sys, "argv", ["testcraft"])
+    monkeypatch.setenv("CRAFT_VERBOSITY_LEVEL", verbosity.name)
+
+    with pytest.raises(SystemExit):
+        app.run()
+
+    _, err = capsys.readouterr()
+    assert "testcraft [help]" in err
+    assert craft_cli.emit._mode == verbosity
+
+
+def test_set_verbosity_from_env_incorrect(monkeypatch, capsys, app):
+    """Test that the emitter verbosity is using the default level when invalid."""
+    monkeypatch.setattr(sys, "argv", ["testcraft"])
+    monkeypatch.setenv("CRAFT_VERBOSITY_LEVEL", "incorrect")
+
+    with pytest.raises(SystemExit):
+        app.run()
+
+    _, err = capsys.readouterr()
+    assert "testcraft [help]" in err
+    assert "Invalid verbosity level 'incorrect'" in err
+    assert "Valid levels are: QUIET, BRIEF, VERBOSE, DEBUG, TRACE" in err
+    assert craft_cli.emit._mode == craft_cli.EmitterMode.BRIEF
+
+
 def test_pre_run_project_dir_managed(app):
     app.is_managed = lambda: True
     dispatcher = mock.Mock(spec_set=craft_cli.Dispatcher)