From 4f790299383eb2a6e8e1c153d2faba71d7c7aaab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:34:50 -0400 Subject: [PATCH] Bumping version to 1.1.0rc1 (#98) * Bumping version to 1.1.0rc1 * Updating requirements to latest release branch * Bumping manifest schema in tests * Fix unit test per dbt-labs/dbt-core#5001 Co-authored-by: Github Build Bot Co-authored-by: leahwicz <60146280+leahwicz@users.noreply.github.com> Co-authored-by: Jeremy Cohen --- .bumpversion.cfg | 2 +- dbt/adapters/redshift/__version__.py | 2 +- dev_requirements.txt | 6 +++--- setup.py | 2 +- tests/integration/docs_generate_tests/test_docs_generate.py | 6 +++--- tests/unit/test_context.py | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d589fdd77..7c4b2d310 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0b1 +current_version = 1.1.0rc1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) diff --git a/dbt/adapters/redshift/__version__.py b/dbt/adapters/redshift/__version__.py index a86cb5c59..09184e924 100644 --- a/dbt/adapters/redshift/__version__.py +++ b/dbt/adapters/redshift/__version__.py @@ -1 +1 @@ -version = '1.1.0b1' +version = '1.1.0rc1' diff --git a/dev_requirements.txt b/dev_requirements.txt index 1dc51f545..26552f3ae 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,8 +1,8 @@ # install latest changes in dbt-core + dbt-postgres # TODO: how to switch from HEAD to x.y.latest branches after minor releases? -git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core -git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=tests/adapter -git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres +git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-core&subdirectory=core +git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-tests-adapter&subdirectory=tests/adapter +git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-postgres&subdirectory=plugins/postgres bumpversion flake8 diff --git a/setup.py b/setup.py index 80561cb5c..16ecd9cad 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ def _get_dbt_core_version(): package_name = "dbt-redshift" -package_version = "1.1.0b1" +package_version = "1.1.0rc1" dbt_core_version = _get_dbt_core_version() description = """The Redshift adapter plugin for dbt""" diff --git a/tests/integration/docs_generate_tests/test_docs_generate.py b/tests/integration/docs_generate_tests/test_docs_generate.py index 3112c4e91..ac0daafb6 100644 --- a/tests/integration/docs_generate_tests/test_docs_generate.py +++ b/tests/integration/docs_generate_tests/test_docs_generate.py @@ -648,7 +648,7 @@ def expected_seeded_manifest(self, model_database=None, quote_model=False): ) return { - 'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json', + 'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v5.json', 'dbt_version': dbt.version.__version__, 'nodes': { 'model.test.model': { @@ -1267,7 +1267,7 @@ def expected_redshift_incremental_view_manifest(self): snapshot_path = self.dir('snapshot/snapshot_seed.sql') return { - 'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json', + 'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v5.json', 'dbt_version': dbt.version.__version__, 'nodes': { 'model.test.model': { @@ -1533,7 +1533,7 @@ def verify_manifest(self, expected_manifest): elif key == 'metadata': metadata = manifest['metadata'] self.verify_metadata( - metadata, 'https://schemas.getdbt.com/dbt/manifest/v4.json') + metadata, 'https://schemas.getdbt.com/dbt/manifest/v5.json') assert 'project_id' in metadata and metadata[ 'project_id'] == '098f6bcd4621d373cade4e832627b4f6' assert 'send_anonymous_usage_stats' in metadata and metadata[ diff --git a/tests/unit/test_context.py b/tests/unit/test_context.py index 550ca0e3c..fa601013d 100644 --- a/tests/unit/test_context.py +++ b/tests/unit/test_context.py @@ -218,6 +218,7 @@ def assert_has_keys( 'sql', 'sql_now', 'adapter_macro', + 'selected_resources', } REQUIRED_MODEL_KEYS = REQUIRED_MACRO_KEYS | {'this'} MAYBE_KEYS = frozenset({'debug'})