Skip to content

Commit d5004da

Browse files
committed
fix breakage from 10d032e: don't parse version strings at all; let setuptools complain instead
1 parent 1d15a76 commit d5004da

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

setup.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,18 @@
99
this_directory = os.path.abspath(os.path.dirname(__file__))
1010

1111
# get this package's version from dbt/adapters/<name>/__version__.py
12-
def _get_plugin_version_dict():
12+
def _get_plugin_version():
1313
_version_path = os.path.join(
1414
this_directory, 'dbt', 'adapters', 'sqlite', '__version__.py'
1515
)
16-
_semver = r'''(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)'''
17-
16+
_semver = r"""(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)"""
1817
_pre = r"""((?P<prekind>a|b|rc)(?P<pre>\d+))?"""
1918
_version_pattern = fr"""version\s*=\s*["']{_semver}{_pre}["']"""
2019

2120
with open(_version_path) as f:
22-
match = re.search(_version_pattern, f.read().strip())
23-
if match is None:
24-
raise ValueError(f'invalid version at {_version_path}')
25-
return match.groupdict()
26-
27-
28-
def _get_plugin_version():
29-
parts = _get_plugin_version_dict()
30-
return "{major}.{minor}.{patch}{prekind}{pre}".format(**parts)
21+
line = f.read().strip()
22+
delim = '"' if '"' in line else "'"
23+
return line.split(delim)[1]
3124

3225

3326
package_name = "dbt-sqlite"

0 commit comments

Comments
 (0)