Skip to content

Commit

Permalink
backport 637 to 1.5.latest (#669)
Browse files Browse the repository at this point in the history
* Dropped support for Python 3.7 (#637)

* update RELEASE_BRANCH env

* drop support for python 3.7

* add changelog entry

(cherry picked from commit f0af916)

* remove dup classifiers entry

---------

Co-authored-by: Matthew McKnight <[email protected]>
  • Loading branch information
2 people authored and leahwicz committed Jun 28, 2023
1 parent 83ad4e4 commit 56c00a5
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
6 changes: 6 additions & 0 deletions .changes/unreleased/Under the Hood-20230530-161341.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Under the Hood
body: remove support for python 3.7
time: 2023-05-30T16:13:41.217839-05:00
custom:
Author: McKnight-42
Issue: "638"
2 changes: 1 addition & 1 deletion .github/scripts/integration-test-matrix.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = ({ context }) => {
const defaultPythonVersion = "3.8";
const supportedPythonVersions = ["3.7", "3.8", "3.9"];
const supportedPythonVersions = ["3.8", "3.9"];
const supportedAdapters = ["snowflake"];

// if PR, generate matrix based on files changed and PR labels
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689)
python-version: [3.8, 3.9]

env:
TOXENV: "unit"
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9]

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.MD
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ WARNING: The parameters in your `test.env` file must link to a valid Snowflake a
There are a few methods for running tests locally.

#### `tox`
`tox` automatically runs unit tests against several Python versions using its own virtualenvs. Run `tox -p` to run unit tests for Python 3.7, Python 3.8, Python 3.9, and `flake8` in parallel. Run `tox -e py37` to invoke tests on Python version 3.7 only (use py37, py38, or py39). Tox recipes are found in `tox.ini`.
`tox` automatically runs unit tests against several Python versions using its own virtualenvs. Run `tox -p` to run unit tests for Python 3.8, Python 3.9, and `flake8` in parallel. Run `tox -e py38` to invoke tests on Python version 3.8 only (use py38, or py39). Tox recipes are found in `tox.ini`.

#### `pytest`
You may run a specific test or group of tests using `pytest` directly. Activate a Python virtualenv active with dev dependencies installed. Then, run tests like so:
Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import sys
import re

# require python 3.7 or newer
if sys.version_info < (3, 7):
# require python 3.8 or newer
if sys.version_info < (3, 8):
print("Error: dbt does not support this version of Python.")
print("Please upgrade to Python 3.7 or higher.")
print("Please upgrade to Python 3.8 or higher.")
sys.exit(1)


Expand Down Expand Up @@ -76,9 +76,8 @@ def _get_dbt_core_version():
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS :: MacOS X",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
python_requires=">=3.7",
python_requires=">=3.8",
)
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
skipsdist = True
envlist = py37,py38,py39
envlist = py38,py39

[testenv:{unit,py37,py38,py39,py}]
description = unit testing
Expand All @@ -13,7 +13,7 @@ deps =
-rdev-requirements.txt
-e.

[testenv:{integration,py37,py38,py39,py}-{snowflake}]
[testenv:{integration,py38,py39,py}-{snowflake}]
description = adapter plugin integration testing
skip_install = true
passenv =
Expand Down

0 comments on commit 56c00a5

Please sign in to comment.