diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 1e03e8be3..a78b4fef8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -3,28 +3,26 @@ current_version = 1.0.1rc1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) - (\.(?P\d+))? - ((?P[a-z]+)(?P\d+))? + ((?Pa|b|rc)(?P\d+))? serialize = - {major}.{minor}.{patch}.{pluginpatch}{prerelease}{num} {major}.{minor}.{patch}{prerelease}{num} - {major}.{minor}.{patch}.{pluginpatch} {major}.{minor}.{patch} commit = False tag = False [bumpversion:part:prerelease] first_value = a +optional_value = final values = a b rc + final [bumpversion:part:num] first_value = 1 -[bumpversion:part:pluginpatch] -first_value = 1 +[bumpversion:file:setup.py] [bumpversion:file:dbt/adapters/spark/__version__.py] diff --git a/setup.py b/setup.py index 9d97d9a9b..69c6cf55e 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import sys import re -# require python 3.6 or newer +# require python 3.7 or newer if sys.version_info < (3, 7): print('Error: dbt does not support this version of Python.') print('Please upgrade to Python 3.7 or higher.') @@ -43,11 +43,6 @@ def _get_plugin_version_dict(): return match.groupdict() -def _get_plugin_version(): - parts = _get_plugin_version_dict() - return "{major}.{minor}.{patch}{prekind}{pre}".format(**parts) - - # require a compatible minor version (~=), prerelease if this is a prerelease def _get_dbt_core_version(): parts = _get_plugin_version_dict() @@ -57,7 +52,7 @@ def _get_dbt_core_version(): # TODO remove old logic and add to versionBump script package_name = "dbt-spark" -package_version = "1.0.0" +package_version = "1.0.1rc1" dbt_core_version = _get_dbt_core_version() description = """The Apache Spark adapter plugin for dbt"""