From 8686eed0d0ba0242df72638ecab12012bb41d658 Mon Sep 17 00:00:00 2001 From: Jeremy Cohen Date: Sun, 7 Nov 2021 19:29:59 +0100 Subject: [PATCH] Rm py36 tests, pkg metadata, bump reqs --- .github/scripts/integration-test-matrix.js | 2 +- .github/workflows/main.yml | 4 ++-- CHANGELOG.md | 1 + core/setup.py | 8 +++----- plugins/postgres/setup.py | 7 +++---- setup.py | 7 +++---- tox.ini | 6 +++--- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/scripts/integration-test-matrix.js b/.github/scripts/integration-test-matrix.js index f34124bfbd4..9b0fadb5d1b 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 = ["postgres"]; // if PR, generate matrix based on files changed and PR labels diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3246dbfa335..722eac66d58 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" @@ -167,7 +167,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 7dd47a7682f..b4e009600f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Speed up node selection by skipping `incorporate_indirect_nodes` if not needed ([#4213](https://github.com/dbt-labs/dbt-core/issues/4213), [#4214](https://github.com/dbt-labs/dbt-core/issues/4214)) - When on_schema_change is set, pass common columns as dest_columns in incremental merge macros ([#4144](https://github.com/dbt-labs/dbt-core/issues/4144), [#4170](https://github.com/dbt-labs/dbt-core/pull/4170)) - Clear adapters before registering in lib module config generation ([#4218](https://github.com/dbt-labs/dbt-core/pull/4218)) +- Remove official support for python 3.6, which is reaching end of life on December 23, 2021 ([#4134](https://github.com/dbt-labs/dbt-core/issues/4134), [#4223](https://github.com/dbt-labs/dbt-core/pull/4223)) Contributors: - [@kadero](https://github.com/kadero) ([#3955](https://github.com/dbt-labs/dbt-core/pull/3955)) diff --git a/core/setup.py b/core/setup.py index ea0237e3426..e911411fdb5 100644 --- a/core/setup.py +++ b/core/setup.py @@ -2,9 +2,9 @@ import os import sys -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) @@ -55,7 +55,6 @@ 'agate>=1.6,<1.6.4', 'click>=8,<9', 'colorama>=0.3.9,<0.4.5', - 'dataclasses>=0.6,<0.9;python_version<"3.7"', 'hologram==0.0.14', 'isodate>=0.6,<0.7', 'logbook>=1.5,<1.6', @@ -82,10 +81,9 @@ '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.3", + python_requires=">=3.7", ) diff --git a/plugins/postgres/setup.py b/plugins/postgres/setup.py index f66192c298f..71e93e6f9f2 100644 --- a/plugins/postgres/setup.py +++ b/plugins/postgres/setup.py @@ -2,9 +2,9 @@ import os import sys -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) @@ -82,10 +82,9 @@ def _dbt_psycopg2_name(): '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/setup.py b/setup.py index 3b11a38463f..669790a228f 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ sys.exit(1) -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) @@ -62,10 +62,9 @@ '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/tox.ini b/tox.ini index 60e4099e159..fb9978cf3a5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = True -envlist = py36,py37,py38,py39,flake8,mypy +envlist = py37,py38,py39,flake8,mypy [testenv:flake8] description = flake8 code checks @@ -21,7 +21,7 @@ deps = -rdev-requirements.txt -reditable-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 @@ -30,7 +30,7 @@ deps = -rdev-requirements.txt -reditable-requirements.txt -[testenv:{integration,py36,py37,py38,py39,py}-{postgres}] +[testenv:{integration,py37,py38,py39,py}-{postgres}] description = adapter plugin integration testing skip_install = true passenv = DBT_* POSTGRES_TEST_* PYTEST_ADDOPTS