Correct pip usage and notarization logging. (#2149)

beeware · Feb 6, 2025 · 90448eb · 90448eb
1 parent 841a130
commit 90448eb
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 28 deletions.
diff --git a/changes/2149.bugfix.1.rst b/changes/2149.bugfix.1.rst
@@ -0,0 +1 @@
+Briefcase no longer uses the ``--no-python-version-warning`` option when invoking pip. This option has been deprecated, is currently a no-op, and will be removed soon.
diff --git a/changes/2149.bugfix.2.rst b/changes/2149.bugfix.2.rst
@@ -0,0 +1 @@
+Some error messages that are an expected part of the macOS notarization process are now hidden from default verbosity.
diff --git a/src/briefcase/commands/create.py b/src/briefcase/commands/create.py
@@ -601,7 +601,6 @@ def _pip_install(
                     "pip",
                     "install",
                     "--disable-pip-version-check",
-                    "--no-python-version-warning",
                     "--upgrade",
                     "--no-user",
                     f"--target={app_packages_path}",

diff --git a/src/briefcase/platforms/macOS/__init__.py b/src/briefcase/platforms/macOS/__init__.py
@@ -980,6 +980,7 @@ def submit_notarization(self, app, identity: SigningIdentity) -> str:
                                 "--output-format",
                                 "json",
                             ],
+                            quiet=1,
                         )
                         submission_id = submission["id"]
                 except subprocess.CalledProcessError as e:
@@ -991,6 +992,7 @@ def submit_notarization(self, app, identity: SigningIdentity) -> str:
                     if e.returncode == 69 and not store_credentials:
                         store_credentials = True
                     else:
+                        self.tools.subprocess.output_error(e)
                         raise BriefcaseCommandError(
                             f"Unable to submit {filename.relative_to(self.base_path)} for notarization."
                         ) from e
@@ -1080,6 +1082,7 @@ def finalize_notarization(
                                 identity.profile,
                                 submission_id,
                             ],
+                            quiet=1,
                         )
 
                         if response["status"] == "Accepted":
@@ -1110,6 +1113,7 @@ def finalize_notarization(
                             # notarization isn't complete yet. Try again in 10 seconds.
                             time.sleep(10)
                         else:
+                            self.tools.subprocess.output_error(e)
                             raise BriefcaseCommandError(
                                 "Unknown problem retrieving notarization status."
                             ) from e

diff --git a/tests/commands/create/test_install_app_requirements.py b/tests/commands/create/test_install_app_requirements.py
@@ -145,7 +145,6 @@ def test_app_packages_valid_requires(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -187,7 +186,6 @@ def test_app_packages_requirement_installer_args_no_paths(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -225,7 +223,6 @@ def test_app_packages_requirement_installer_args_path_transformed(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -264,7 +261,6 @@ def test_app_packages_requirement_installer_args_coincidental_path_not_transform
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -302,7 +298,6 @@ def test_app_packages_requirement_installer_args_path_not_transformed(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -341,7 +336,6 @@ def test_app_packages_requirement_installer_args_combined_argument_not_transform
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -381,7 +375,6 @@ def test_app_packages_valid_requires_no_support_package(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -430,7 +423,6 @@ def test_app_packages_invalid_requires(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -477,7 +469,6 @@ def test_app_packages_offline(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -528,7 +519,6 @@ def test_app_packages_install_requirements(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -584,7 +574,6 @@ def test_app_packages_replace_existing_requirements(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -996,7 +985,6 @@ def test_app_packages_test_requires(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -1036,7 +1024,6 @@ def test_app_packages_test_requires_test_mode(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",
@@ -1079,7 +1066,6 @@ def test_app_packages_only_test_requires_test_mode(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={app_packages_path}",

diff --git a/tests/platforms/iOS/xcode/test_create.py b/tests/platforms/iOS/xcode/test_create.py
@@ -56,7 +56,6 @@ def test_extra_pip_args(create_command, first_app_generated, tmp_path):
                 "pip",
                 "install",
                 "--disable-pip-version-check",
-                "--no-python-version-warning",
                 "--upgrade",
                 "--no-user",
                 f"--target={bundle_path / 'app_packages.iphoneos'}",
@@ -93,7 +92,6 @@ def test_extra_pip_args(create_command, first_app_generated, tmp_path):
                 "pip",
                 "install",
                 "--disable-pip-version-check",
-                "--no-python-version-warning",
                 "--upgrade",
                 "--no-user",
                 f"--target={bundle_path / 'app_packages.iphonesimulator'}",

diff --git a/tests/platforms/iOS/xcode/test_update.py b/tests/platforms/iOS/xcode/test_update.py
@@ -43,7 +43,6 @@ def test_extra_pip_args(update_command, first_app_generated, tmp_path):
                 "pip",
                 "install",
                 "--disable-pip-version-check",
-                "--no-python-version-warning",
                 "--upgrade",
                 "--no-user",
                 f"--target={bundle_path / 'app_packages.iphoneos'}",
@@ -80,7 +79,6 @@ def test_extra_pip_args(update_command, first_app_generated, tmp_path):
                 "pip",
                 "install",
                 "--disable-pip-version-check",
-                "--no-python-version-warning",
                 "--upgrade",
                 "--no-user",
                 f"--target={bundle_path / 'app_packages.iphonesimulator'}",

diff --git a/tests/platforms/linux/test_LocalRequirementsMixin.py b/tests/platforms/linux/test_LocalRequirementsMixin.py
@@ -173,7 +173,6 @@ def test_install_app_requirements_in_docker(create_command, first_app_config, tm
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             "--target=/app/path/to/app_packages",
@@ -232,7 +231,6 @@ def test_install_app_requirements_no_docker(
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             f"--target={tmp_path / 'base_path/build/first-app/tester/dummy/path/to/app_packages'}",
@@ -333,7 +331,6 @@ def build_sdist(*args, **kwargs):
             "pip",
             "install",
             "--disable-pip-version-check",
-            "--no-python-version-warning",
             "--upgrade",
             "--no-user",
             "--target=/app/path/to/app_packages",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Briefcase no longer uses the ``--no-python-version-warning`` option when invoking pip. This option has been deprecated, is currently a no-op, and will be removed soon.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Some error messages that are an expected part of the macOS notarization process are now hidden from default verbosity.