Skip to content

Commit e36a1db

Browse files
committed
fix version parsing issue that only happens when code is run using setup.py; not sure why this works for dbt-snowflake
1 parent 17df33b commit e36a1db

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

setup.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@ def _get_plugin_version_dict():
1414
this_directory, 'dbt', 'adapters', 'sqlite', '__version__.py'
1515
)
1616
_semver = r'''(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)'''
17-
_pre = r'''((?P<prekind>a|b|rc)(?P<pre>\d+))?'''
18-
_version_pattern = fr'''version\s*=\s*["']{_semver}{_pre}["']'''
17+
18+
# not sure why this works in dbt-snowflake:
19+
# it causes setuptools to populate prekind and pre with 'None' strings
20+
# so we just don't parse it
21+
22+
#_pre = r'''((?P<prekind>a|b|rc)(?P<pre>\d+))?'''
23+
#_version_pattern = fr'''version\s*=\s*["']{_semver}{_pre}["']'''
24+
25+
_version_pattern = fr'''version\s*=\s*["']{_semver}["']'''
1926
with open(_version_path) as f:
2027
match = re.search(_version_pattern, f.read().strip())
2128
if match is None:
@@ -25,7 +32,8 @@ def _get_plugin_version_dict():
2532

2633
def _get_plugin_version():
2734
parts = _get_plugin_version_dict()
28-
return "{major}.{minor}.{patch}{prekind}{pre}".format(**parts)
35+
#return "{major}.{minor}.{patch}{prekind}{pre}".format(**parts)
36+
return "{major}.{minor}.{patch}".format(**parts)
2937

3038

3139
package_name = "dbt-sqlite"

0 commit comments

Comments
 (0)