Merge pull request #2249 from fishtown-analytics/fix/rev-google-lower…

…-bound rev the bigquery minimum versions to a big number (#2233)
dbt-labs · Mar 26, 2020 · 386895f · 386895f
2 parents f58bf87 + 6065237
commit 386895f
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 15 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.0
+current_version = 0.16.1a1
 parse = (?P<major>\d+)
  \.(?P<minor>\d+)
  \.(?P<patch>\d+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## dbt 0.16.1 (Relase date TBD)
+
+### Under the hood
+- Pin google libraries to higher minimum values, add more dependencies as explicit ([#2233](https:/fishtown-analytics/dbt/issues/2233), [#2249](https:/fishtown-analytics/dbt/pull/2249))
+
+
+## dbt 0.16.0 (March 23, 2020)
+
 ## dbt 0.16.0rc4 (March 20, 2020)
 
 ### Fixes

diff --git a/core/dbt/version.py b/core/dbt/version.py
@@ -56,5 +56,5 @@ def get_version_information():
  .format(version_msg))
 
 
-__version__ = '0.16.0'
+__version__ = '0.16.1a1'
 installed = get_installed_version()
diff --git a/core/setup.py b/core/setup.py
@@ -18,7 +18,7 @@ def read(fname):
 
 
 package_name = "dbt-core"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """dbt (data build tool) is a command line tool that helps \
 analysts and engineers transform data in their warehouse more effectively"""
 

diff --git a/plugins/bigquery/setup.py b/plugins/bigquery/setup.py
@@ -14,7 +14,7 @@
 
 
 package_name = "dbt-bigquery"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """The bigquery adapter plugin for dbt (data build tool)"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))
@@ -40,12 +40,11 @@
  },
  install_requires=[
  'dbt-core=={}'.format(package_version),
- 'google-cloud-core>=1,<=1.3.0',
- 'google-cloud-bigquery>=1.22.0,<1.25.0',
- # hidden secret dependency: bq 1.23.0 requires this but only documents
- # 1.10.0 through its dependency chain.
- # see https:/googleapis/google-cloud-python/issues/9965
- 'six>=1.13.0',
+ 'google-cloud-core>=1.3.0,<1.4',
+ 'google-cloud-bigquery>=1.24.0,<1.25.0',
+ 'google-api-core>=1.16.0,<1.17.0',
+ 'googleapis-common-protos>=1.6.0,<1.7.0',
+ 'six>=1.14.0',
  ],
  zip_safe=False,
  classifiers=[

diff --git a/plugins/postgres/setup.py b/plugins/postgres/setup.py
@@ -35,7 +35,7 @@ def _dbt_psycopg2_name():
 
 
 package_name = "dbt-postgres"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """The postgres adpter plugin for dbt (data build tool)"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))

diff --git a/plugins/redshift/setup.py b/plugins/redshift/setup.py
@@ -14,7 +14,7 @@
 
 
 package_name = "dbt-redshift"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """The redshift adapter plugin for dbt (data build tool)"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))

diff --git a/plugins/snowflake/setup.py b/plugins/snowflake/setup.py
@@ -14,7 +14,7 @@
 
 
 package_name = "dbt-snowflake"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """The snowflake adapter plugin for dbt (data build tool)"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 
 package_name = "dbt"
-package_version = "0.16.0"
+package_version = "0.16.1a1"
 description = """With dbt, data analysts and engineers can build analytics \
 the way engineers build applications."""
 

diff --git a/test/unit/test_bigquery_adapter.py b/test/unit/test_bigquery_adapter.py
@@ -182,7 +182,7 @@ def test_location_user_agent(self, mock_bq, mock_auth_default):
 
 
 class HasUserAgent:
- PAT = re.compile(r'dbt-\d+\.\d+\.\d+[a-zA-Z]+\d+')
+ PAT = re.compile(r'dbt-\d+\.\d+\.\d+((a|b|rc)\d+)?')
 
  def __eq__(self, other):
  compare = getattr(other, 'user_agent', '')