fix regression with import packaging for branch coverage

Author: eleanorjboyd

python_files/unittestadapter/execution.py

@@ -12,8 +12,6 @@
 from types import TracebackType
 from typing import Dict, List, Optional, Set, Tuple, Type, Union
 
-from packaging.version import Version
-
 # Adds the scripts directory to the PATH as a workaround for enabling shell for test execution.
 path_var_name = "PATH" if "PATH" in os.environ else "Path"
 os.environ[path_var_name] = (
@@ -326,9 +324,14 @@ def send_run_data(raw_data, test_run_pipe):
         )
         import coverage
 
-        coverage_version = Version(coverage.__version__)
-        # only include branches if coverage version is 7.7.0 or greater (as this was when the api saves)
-        if coverage_version >= Version("7.7.0"):
+        def parse_version(version_str):
+            try:
+                return tuple(int(part) for part in version_str.split(".") if part.isdigit())
+            except ValueError:
+                return (0, 0, 0)
+
+        # only include branches if coverage version is 7.7.0 or greater
+        if parse_version(coverage.__version__) >= (7, 7, 0):
             include_branches = True
 
         source_ar: List[str] = []

python_files/vscode_pytest/__init__.py

@@ -13,7 +13,6 @@
 from typing import TYPE_CHECKING, Any, Dict, Generator, Literal, TypedDict
 
 import pytest
-from packaging.version import Version
 
 if TYPE_CHECKING:
     from pluggy import Result
@@ -443,10 +442,16 @@ def pytest_sessionfinish(session, exitstatus):
         # load the report and build the json result to return
         import coverage
 
-        coverage_version = Version(coverage.__version__)
         global INCLUDE_BRANCHES
-        # only include branches if coverage version is 7.7.0 or greater (as this was when the api saves)
-        if coverage_version < Version("7.7.0") and INCLUDE_BRANCHES:
+
+        def parse_version(version_str):
+            try:
+                return tuple(int(part) for part in version_str.split(".") if part.isdigit())
+            except ValueError:
+                return (0, 0, 0)
+
+        # only include branches if coverage version is 7.7.0 or greater
+        if parse_version(coverage.__version__) < (7, 7, 0) and INCLUDE_BRANCHES:
             print(
                 "Plugin warning[vscode-pytest]: Branch coverage not supported in this coverage versions < 7.7.0. Please upgrade coverage package if you would like to see branch coverage."
             )