refactor: Drop support for Python 3.7 (#1837)

meltano · Jan 9, 2024 · 6532984 · 6532984
1 parent 873ea36
commit 6532984
Show file tree

Hide file tree

Showing 20 changed files with 234 additions and 694 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -32,7 +32,6 @@ body:
       description: Version of Python you are using
       options:
         - "3.6 (deprecated)"
-        - "3.7"
         - "3.8"
         - "3.9"
         - "3.10"
@@ -76,6 +75,6 @@ body:
     attributes:
       label: Code
       description: Paste the failing code and/or traceback, if applicable
-      render: python
+      render: Python
     validations:
       required: false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         session: [tests]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         sqlalchemy: ["2"]
         include:
         - { session: tests,   python-version: "3.11", os: "ubuntu-latest", sqlalchemy: "1" }

diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml
@@ -13,6 +13,15 @@ keywords = [
     "Mapper",
     "{{cookiecutter.name}}",
 ]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
 license = "Apache-2.0"
 {%- if cookiecutter.variant != "None (Skip)" %}
 packages = [
@@ -21,7 +30,7 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4"
+python = ">=3.8"
 singer-sdk = { version="~=0.34.1" }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 
@@ -38,7 +47,7 @@ warn_unused_configs = true
 
 [tool.ruff]
 src = ["{{cookiecutter.library_name}}"]
-target-version = "py37"
+target-version = "py38"
 
 [tool.ruff.lint]
 ignore = [

diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/tox.ini b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/tox.ini
@@ -1,7 +1,7 @@
 # This file can be used to customize tox tests as well as other test frameworks like flake8 and mypy
 
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 isolated_build = true
 
 [testenv]
@@ -13,7 +13,7 @@ commands =
 [testenv:pytest]
 # Run the python tests.
 # To execute, run `tox -e pytest`
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 commands =
     poetry install -v
     poetry run pytest
diff --git a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/workflows/test.yml b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       GITHUB_TOKEN: {{ '${{secrets.GITHUB_TOKEN}}' }}
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python {{ '${{ matrix.python-version }}' }}

diff --git a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/pyproject.toml b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/pyproject.toml
@@ -12,6 +12,15 @@ keywords = [
     "ELT",
     "{{cookiecutter.source_name}}",
 ]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
 license = "Apache-2.0"
 {%- if cookiecutter.variant != "None (Skip)" %}
 packages = [
@@ -20,7 +29,7 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4"
+python = ">=3.8"
 importlib-resources = { version = "==6.1.*", python = "<3.9" }
 singer-sdk = { version="~=0.34.1" }
 fs-s3fs = { version = "~=1.1.1", optional = true }
@@ -47,7 +56,7 @@ plugins = "sqlmypy"
 
 [tool.ruff]
 src = ["{{cookiecutter.library_name}}"]
-target-version = "py37"
+target-version = "py38"
 
 [tool.ruff.lint]
 ignore = [

diff --git a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/tox.ini b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/tox.ini
@@ -1,7 +1,7 @@
 # This file can be used to customize tox tests as well as other test frameworks like flake8 and mypy
 
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 isolated_build = true
 
 [testenv]
@@ -13,7 +13,7 @@ commands =
 [testenv:pytest]
 # Run the python tests.
 # To execute, run `tox -e pytest`
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 commands =
     poetry install -v
     poetry run pytest
diff --git a/...ecutter/tap-template/{{cookiecutter.tap_id}}/{{cookiecutter.library_name}}/rest-client.py b/...ecutter/tap-template/{{cookiecutter.tap_id}}/{{cookiecutter.library_name}}/rest-client.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import sys
+from functools import cached_property
 from typing import Any, Callable, Iterable
 
 import requests
@@ -38,14 +39,6 @@
 
 {% endif -%}
 
-{%- if cookiecutter.auth_method in ("OAuth2", "JWT") -%}
-if sys.version_info >= (3, 8):
-    from functools import cached_property
-else:
-    from cached_property import cached_property
-
-{% endif -%}
-
 if sys.version_info >= (3, 9):
     import importlib.resources as importlib_resources
 else:

diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/workflows/test.yml b/cookiecutter/target-template/{{cookiecutter.target_id}}/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       GITHUB_TOKEN: {{ '${{secrets.GITHUB_TOKEN}}' }}
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python {{ '${{ matrix.python-version }}' }}

diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/pyproject.toml b/cookiecutter/target-template/{{cookiecutter.target_id}}/pyproject.toml
@@ -12,6 +12,15 @@ keywords = [
     "ELT",
     "{{cookiecutter.destination_name}}",
 ]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
 license = "Apache-2.0"
 {%- if cookiecutter.variant != "None (Skip)" %}
 packages = [
@@ -20,7 +29,7 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4"
+python = ">=3.8"
 singer-sdk = { version="~=0.34.1" }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.serialization_method != "SQL" %}
@@ -36,7 +45,7 @@ s3 = ["fs-s3fs"]
 
 [tool.ruff]
 src = ["{{cookiecutter.library_name}}"]
-target-version = "py37"
+target-version = "py38"
 
 [tool.ruff.lint]
 ignore = [

diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/tox.ini b/cookiecutter/target-template/{{cookiecutter.target_id}}/tox.ini
@@ -1,7 +1,7 @@
 # This file can be used to customize tox tests as well as other test frameworks like flake8 and mypy
 
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 isolated_build = true
 
 [testenv]
@@ -13,7 +13,7 @@ commands =
 [testenv:pytest]
 # Run the python tests.
 # To execute, run `tox -e pytest`
-envlist = py37, py38, py39, py310, py311
+envlist = py{38,39,310,311,312}
 commands =
     poetry install -v
     poetry run pytest
diff --git a/noxfile.py b/noxfile.py
@@ -28,7 +28,7 @@
 COOKIECUTTER_REPLAY_FILES = list(Path("./e2e-tests/cookiecutters").glob("*.json"))
 
 package = "singer_sdk"
-python_versions = ["3.12", "3.11", "3.10", "3.9", "3.8", "3.7"]
+python_versions = ["3.12", "3.11", "3.10", "3.9", "3.8"]
 main_python_version = "3.11"
 locations = "singer_sdk", "tests", "noxfile.py", "docs/conf.py"
 nox.options.sessions = (