Skip to content

Commit 078b418

Browse files
authored
Removed "packaging" package dependency (#3469)
Removed dependency on "packaging" package to address release issue.
1 parent dcfe27e commit 078b418

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/databricks/labs/ucx/hive_metastore/federation.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from dataclasses import dataclass, replace
55
from functools import cached_property
66
from typing import ClassVar
7-
from packaging.version import Version, InvalidVersion
87

98

109
from databricks.labs.blueprint.installation import Installation
@@ -113,16 +112,15 @@ def _external_hms(self) -> ExternalHmsInfo | None:
113112
if not jdbc_url:
114113
logger.info('JDBC URL not found')
115114
return None
116-
version_value = self._get_value_from_config_key(spark_config, 'spark.sql.hive.metastore.version')
117-
if not version_value:
115+
version = self._get_value_from_config_key(spark_config, 'spark.sql.hive.metastore.version')
116+
if not version:
118117
logger.info('Hive Metastore version not found')
119118
return None
120-
try:
121-
version = Version(version_value)
122-
except InvalidVersion:
123-
logger.info('Hive Metastore version is not valid')
119+
major_minor_match = re.match(r'(^\d+\.\d+)', version)
120+
if not major_minor_match:
121+
logger.info(f'Wrong Hive Metastore Database Version Format: {version}')
124122
return None
125-
major_minor_version = f"{version.major}.{version.minor}"
123+
major_minor_version = major_minor_match.group(1)
126124
external_hms = replace(self._split_jdbc_url(jdbc_url), version=major_minor_version)
127125
supported_versions = self.supported_database_versions.get(external_hms.database_type)
128126
if not supported_versions:

0 commit comments

Comments
 (0)