From 24482ea99b9476e22b9de9ae74eb8a646db56321 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 11:24:20 -0400 Subject: [PATCH] Bumping version to 1.2.0a1 (#136) * Bumping version to 1.2.0a1 * Remove extra space * Skip test-build if alpha * fix whitespace * Updating schema manifest Co-authored-by: Github Build Bot Co-authored-by: leahwicz <60146280+leahwicz@users.noreply.github.com> Co-authored-by: Jeremy Cohen --- .bumpversion.cfg | 2 +- .github/workflows/main.yml | 12 ++++++++++++ dbt/adapters/snowflake/__version__.py | 2 +- setup.py | 2 +- .../docs_generate_tests/test_docs_generate.py | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 1a8094437..94232ca9c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0b1 +current_version = 1.2.0a1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcf8d432a..d8d04e428 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -115,6 +115,9 @@ jobs: runs-on: ubuntu-latest + outputs: + is_alpha: ${{ steps.check-is-alpha.outputs.is_alpha }} + steps: - name: Check out the repository uses: actions/checkout@v2 @@ -146,6 +149,13 @@ jobs: run: | check-wheel-contents dist/*.whl --ignore W007,W008 + - name: Check if this is an alpha version + id: check-is-alpha + run: | + export is_alpha=0 + if [[ "$(ls -lh dist/)" == *"a1"* ]]; then export is_alpha=1; fi + echo "::set-output name=is_alpha::$is_alpha" + - uses: actions/upload-artifact@v2 with: name: dist @@ -154,6 +164,8 @@ jobs: test-build: name: verify packages / python ${{ matrix.python-version }} / ${{ matrix.os }} + if: needs.build.outputs.is_alpha == 0 + needs: build runs-on: ${{ matrix.os }} diff --git a/dbt/adapters/snowflake/__version__.py b/dbt/adapters/snowflake/__version__.py index 56ec17a89..a6b977228 100644 --- a/dbt/adapters/snowflake/__version__.py +++ b/dbt/adapters/snowflake/__version__.py @@ -1 +1 @@ -version = "1.1.0b1" +version = "1.2.0a1" diff --git a/setup.py b/setup.py index 888da6449..332b5d68e 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def _get_dbt_core_version(): package_name = "dbt-snowflake" -package_version = "1.1.0b1" +package_version = "1.2.0a1" dbt_core_version = _get_dbt_core_version() description = """The Snowflake 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 118d121ee..a7d8d1dd4 100644 --- a/tests/integration/docs_generate_tests/test_docs_generate.py +++ b/tests/integration/docs_generate_tests/test_docs_generate.py @@ -519,7 +519,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': { @@ -1167,7 +1167,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[