fix merge conflict issues

dbt_common/semver.py

@@ -36,7 +36,9 @@ class VersionSpecification(dbtClassMixin):
 (?P<major>{num_no_leading_zeros})\.
 (?P<minor>{num_no_leading_zeros})\.
 (?P<patch>{num_no_leading_zeros})
-""".format(num_no_leading_zeros=_NUM_NO_LEADING_ZEROS)
+""".format(
+    num_no_leading_zeros=_NUM_NO_LEADING_ZEROS
+)
 
 _VERSION_EXTRA_REGEX = r"""
 (\-?
@@ -45,7 +47,9 @@ class VersionSpecification(dbtClassMixin):
 (\+
   (?P<build>
     {alpha}(\.{alpha})*))?
-""".format(alpha_no_leading_zeros=_ALPHA_NO_LEADING_ZEROS, alpha=_ALPHA)
+""".format(
+    alpha_no_leading_zeros=_ALPHA_NO_LEADING_ZEROS, alpha=_ALPHA
+)
 
 
 _VERSION_REGEX_PAT_STR = r"""

pyproject.toml

@@ -80,16 +80,14 @@ extra-dependencies = [
     "flake8",
     "Flake8-pyproject",
     "mypy~=1.3",
+    "pytest~=7.3",  # needed for linting tests
     "ruff==0.1.11",
     "types-Jinja2~=2.11",
     "types-jsonschema~=4.17",
     "types-protobuf~=4.24.0",
     "types-python-dateutil~=2.8",
     "types-PyYAML~=6.0",
-    "types-requests<2.31.0" # types-requests 2.31.0.8 requires 
-
-    lib3>=2, but we pin urllib3 ~= 1.0 because of openssl requirement for requests
-
+    "types-requests<2.31.0" # types-requests 2.31.0.8 requires lib3>=2, but we pin urllib3 ~= 1.0 because of openssl requirement for requests
 ]
 
 [tool.hatch.envs.lint.scripts]
@@ -110,6 +108,7 @@ extra-dependencies = [
     "pytest-xdist~=3.2",
     "hypothesis~=6.87"
 ]
+
 [[tool.hatch.envs.test.matrix]]
 python = ["3.8","3.9","3.10", "3.11"]