diff --git a/.github/scripts/integration-test-matrix.js b/.github/scripts/integration-test-matrix.js index ae1768bf7..6a33653a2 100644 --- a/.github/scripts/integration-test-matrix.js +++ b/.github/scripts/integration-test-matrix.js @@ -1,6 +1,6 @@ module.exports = ({ context }) => { const defaultPythonVersion = "3.8"; - const supportedPythonVersions = ["3.6", "3.7", "3.8", "3.9"]; + const supportedPythonVersions = ["3.7", "3.8", "3.9"]; const supportedAdapters = ["bigquery"]; // if PR, generate matrix based on files changed and PR labels diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb2314d81..23cdb4502 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -77,7 +77,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689) + python-version: [3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689) env: TOXENV: "unit" @@ -171,7 +171,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 99c567717..b9d087bde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ N/A ### Under the hood - Capping `google-api-core` to version `1.31.3` due to `protobuf` dependency conflict ([#53](https://github.com/dbt-labs/dbt-bigquery/pull/53)) - Bump `google-cloud-core` and `google-api-core` upper bounds to `<3`, thereby removing `<1.31.3` limit on the latter. Remove explicit dependency on `six` ([#57](https://github.com/dbt-labs/dbt-bigquery/pull/57)) +- Remove official support for python 3.6, which is reaching end of life on December 23, 2021 ([dbt-core#4134](https://github.com/dbt-labs/dbt-core/issues/4134), [#59](https://github.com/dbt-labs/dbt-bigquery/pull/59)) ### Contributors - [@imartynetz](https://github.com/imartynetz) ([#48](https://github.com/dbt-labs/dbt-bigquery/pull/48)) diff --git a/setup.py b/setup.py index f1bc12ddc..191c69a44 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,9 @@ import re # require python 3.6 or newer -if sys.version_info < (3, 6): +if sys.version_info < (3, 7): print('Error: dbt does not support this version of Python.') - print('Please upgrade to Python 3.6 or higher.') + print('Please upgrade to Python 3.7 or higher.') sys.exit(1) @@ -90,10 +90,9 @@ def _get_dbt_core_version(): 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', ], - python_requires=">=3.6.2", + python_requires=">=3.7", ) diff --git a/tests/integration/docs_generate_tests/test_docs_generate.py b/tests/integration/docs_generate_tests/test_docs_generate.py index bb8df64bb..8621d1e15 100644 --- a/tests/integration/docs_generate_tests/test_docs_generate.py +++ b/tests/integration/docs_generate_tests/test_docs_generate.py @@ -1252,6 +1252,7 @@ def expected_seeded_manifest(self, model_database=None, quote_model=False): 'tags': [] } }, + 'metrics': {}, 'selectors': {}, 'parent_map': { 'model.test.model': ['seed.test.seed'], @@ -1728,6 +1729,7 @@ def expected_bigquery_complex_manifest(self): }, 'sources': {}, 'exposures': {}, + 'metrics': {}, 'selectors': {}, 'child_map': { 'model.test.clustered': [], @@ -1812,6 +1814,7 @@ def verify_manifest(self, expected_manifest): manifest_keys = frozenset({ 'nodes', 'sources', 'macros', 'parent_map', 'child_map', 'docs', 'metadata', 'docs', 'disabled', 'exposures', 'selectors', + 'metrics', }) self.assertEqual(frozenset(manifest), manifest_keys) diff --git a/tox.ini b/tox.ini index 53971de00..f938e6d4f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = True -envlist = py36,py37,py38,py39,flake8 +envlist = py37,py38,py39,flake8 [testenv:flake8] description = flake8 code checks @@ -11,7 +11,7 @@ commands = flake8 --select=E,W,F --ignore=W504,E741 --max-line-length 99 \ deps = -rdev_requirements.txt -[testenv:{unit,py36,py37,py38,py39,py}] +[testenv:{unit,py37,py38,py39,py}] description = unit testing skip_install = true passenv = DBT_* PYTEST_ADDOPTS @@ -20,7 +20,7 @@ deps = -rdev_requirements.txt -e. -[testenv:{integration,py36,py37,py38,py39,py}-{bigquery}] +[testenv:{integration,py37,py38,py39,py}-{bigquery}] description = adapter plugin integration testing skip_install = true passenv = DBT_* BIGQUERY_TEST_* PYTEST_ADDOPTS