Updates after dropping Python 3.6 and 3.7

changes/1372.misc.rst

@@ -0,0 +1 @@
+Updates after dropping Python 3.6 and 3.7.

src/briefcase/integrations/java.py

@@ -262,7 +262,6 @@ def install(self):
 
         with self.tools.input.wait_bar("Installing OpenJDK..."):
             try:
-                # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
                 self.tools.shutil.unpack_archive(
                     os.fsdecode(jdk_zip_path),
                     extract_dir=os.fsdecode(self.tools.base_path),

src/briefcase/integrations/wix.py

@@ -138,7 +138,6 @@ def install(self):
 
         try:
             with self.tools.input.wait_bar("Installing WiX..."):
-                # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
                 self.tools.shutil.unpack_archive(
                     os.fsdecode(wix_zip_path),
                     extract_dir=os.fsdecode(self.wix_home),

tests/integrations/android_sdk/AndroidSDK/test_verify_emulator_skin.py

@@ -20,8 +20,6 @@ def test_existing_skin(mock_tools, android_sdk):
 
 def test_new_skin(mock_tools, android_sdk):
     """If the skin doesn't exist, an attempt is made to download it."""
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
-    # Remove if block when we drop py3.7 support.
     skin_tgz_path = MagicMock(spec_set=Path)
     skin_tgz_path.__fspath__.return_value = "/path/to/skin.tgz"
     mock_tools.download.file.return_value = skin_tgz_path
@@ -50,8 +48,6 @@ def test_new_skin(mock_tools, android_sdk):
 
 def test_skin_download_failure(mock_tools, android_sdk, tmp_path):
     """If the skin download fails, an error is raised."""
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
-    # Remove if block when we drop py3.7 support.
     skin_tgz_path = MagicMock(spec_set=Path)
     skin_tgz_path.__fspath__.return_value = "/path/to/skin.tgz"
     mock_tools.download.file.return_value = skin_tgz_path
@@ -79,8 +75,6 @@ def test_skin_download_failure(mock_tools, android_sdk, tmp_path):
 def test_unpack_failure(mock_tools, android_sdk, tmp_path):
     """If the download is corrupted and unpacking fails, an error is raised."""
     # Mock the result of the download of a skin
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     skin_tgz_path = MagicMock(spec_set=Path)
     skin_tgz_path.__fspath__.return_value = "/path/to/skin.tgz"
     mock_tools.download.file.return_value = skin_tgz_path

tests/integrations/java/test_JDK__upgrade.py

@@ -60,8 +60,6 @@ def rmtree(path):
     mock_tools.shutil.rmtree.side_effect = rmtree
 
     # Mock the cached download path.
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     archive = MagicMock()
     archive.__fspath__.return_value = "/path/to/download.zip"
     mock_tools.download.file.return_value = archive
@@ -87,7 +85,6 @@ def rmtree(path):
     )
 
     # The archive was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         "/path/to/download.zip", extract_dir=os.fsdecode(tmp_path / "tools")
     )
@@ -112,8 +109,6 @@ def rmtree(path):
     mock_tools.shutil.rmtree.side_effect = rmtree
 
     # Mock the cached download path.
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     archive = MagicMock()
     archive.__fspath__.return_value = "/path/to/download.zip"
     mock_tools.download.file.return_value = archive
@@ -139,7 +134,6 @@ def rmtree(path):
     )
 
     # The archive was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         "/path/to/download.zip",
         extract_dir=os.fsdecode(tmp_path / "tools"),
@@ -198,8 +192,6 @@ def rmtree(path):
     mock_tools.shutil.rmtree.side_effect = rmtree
 
     # Mock the cached download path
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     archive = MagicMock()
     archive.__fspath__.return_value = "/path/to/download.zip"
     mock_tools.download.file.return_value = archive
@@ -226,7 +218,6 @@ def rmtree(path):
     )
 
     # The archive was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         "/path/to/download.zip",
         extract_dir=os.fsdecode(tmp_path / "tools"),

tests/integrations/java/test_JDK__verify.py

@@ -451,8 +451,6 @@ def test_successful_jdk_download(
     mock_tools.os.environ = {"JAVA_HOME": "/does/not/exist"}
 
     # Mock the cached download path
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     archive = mock.MagicMock()
     archive.__fspath__.return_value = "/path/to/download.zip"
     mock_tools.download.file.return_value = archive
@@ -477,7 +475,6 @@ def test_successful_jdk_download(
         role="Java 17 JDK",
     )
     # The archive was unpacked
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         "/path/to/download.zip", extract_dir=os.fsdecode(tmp_path / "tools")
     )
@@ -529,8 +526,6 @@ def test_invalid_jdk_archive(mock_tools, tmp_path):
     mock_tools.host_arch = "x86_64"
 
     # Mock the cached download path
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     archive = mock.MagicMock()
     archive.__fspath__.return_value = "/path/to/download.zip"
     mock_tools.download.file.return_value = archive
@@ -549,7 +544,6 @@ def test_invalid_jdk_archive(mock_tools, tmp_path):
         role="Java 17 JDK",
     )
     # An attempt was made to unpack the archive.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         "/path/to/download.zip",
         extract_dir=os.fsdecode(tmp_path / "tools"),

tests/integrations/wix/test_WiX__upgrade.py

@@ -51,8 +51,6 @@ def test_existing_wix_install(mock_tools, tmp_path):
     wix_path = tmp_path / "tools" / "wix"
 
     wix_zip_path = os.fsdecode(tmp_path / "tools" / "wix.zip")
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     wix_zip = MagicMock()
     wix_zip.__fspath__.return_value = wix_zip_path
 
@@ -75,7 +73,6 @@ def test_existing_wix_install(mock_tools, tmp_path):
     )
 
     # The download was unpacked
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         os.fsdecode(wix_zip_path), extract_dir=os.fsdecode(wix_path)
     )
@@ -125,8 +122,6 @@ def test_unpack_fail(mock_tools, tmp_path):
 
     # Mock the download
     wix_zip_path = os.fsdecode(tmp_path / "tools" / "wix.zip")
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     wix_zip = MagicMock()
     wix_zip.__fspath__.return_value = wix_zip_path
 
@@ -151,7 +146,6 @@ def test_unpack_fail(mock_tools, tmp_path):
     )
 
     # The download was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         os.fsdecode(wix_zip_path), extract_dir=os.fsdecode(wix_path)
     )

tests/integrations/wix/test_WiX__verify.py

@@ -104,8 +104,6 @@ def test_download_wix(mock_tools, tmp_path):
     wix_path = tmp_path / "tools" / "wix"
 
     wix_zip_path = os.fsdecode(tmp_path / "tools" / "wix.zip")
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     wix_zip = MagicMock()
     wix_zip.__fspath__.return_value = wix_zip_path
 
@@ -125,7 +123,6 @@ def test_download_wix(mock_tools, tmp_path):
     )
 
     # The download was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         os.fsdecode(wix_zip_path), extract_dir=os.fsdecode(wix_path)
     )
@@ -191,8 +188,6 @@ def test_unpack_fail(mock_tools, tmp_path):
     wix_path = tmp_path / "tools" / "wix"
 
     wix_zip_path = os.fsdecode(tmp_path / "tools" / "wix.zip")
-    # Consider to remove if block when we drop py3.7 support, only keep statements from else.
-    # MagicMock below py3.8 doesn't have __fspath__ attribute.
     wix_zip = MagicMock()
     wix_zip.__fspath__.return_value = wix_zip_path
 
@@ -217,7 +212,6 @@ def test_unpack_fail(mock_tools, tmp_path):
     )
 
     # The download was unpacked.
-    # TODO: Py3.6 compatibility; os.fsdecode not required in Py3.7
     mock_tools.shutil.unpack_archive.assert_called_with(
         os.fsdecode(wix_zip_path), extract_dir=os.fsdecode(wix_path)
     )