From 206ff99ef78e3829e5aa8290e92b38ce1eb95d46 Mon Sep 17 00:00:00 2001 From: "Edgar R. M" Date: Wed, 23 Aug 2023 10:54:24 -0600 Subject: [PATCH] fix!: Drop support for SQLAlchemy 1.4 (#1916) --- .github/workflows/test.yml | 13 +++++-------- noxfile.py | 8 -------- tests/conftest.py | 6 ------ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 960aede32..8ee8d96a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ env: jobs: tests: - name: "Test on ${{ matrix.python-version }} (${{ matrix.session }}) / ${{ matrix.os }} / SQLAlchemy: ${{ matrix.sqlalchemy }}" + name: "Test on ${{ matrix.python-version }} (${{ matrix.session }}) / ${{ matrix.os }}" runs-on: ${{ matrix.os }} continue-on-error: true env: @@ -49,12 +49,11 @@ jobs: session: [tests] os: ["ubuntu-latest", "macos-latest", "windows-latest"] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - sqlalchemy: ["2"] include: - - { session: tests, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "1" } - - { session: doctest, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "2" } - - { session: mypy, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "2" } - - { session: deps, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "2" } + - { session: tests, python-version: "3.12", os: "ubuntu-latest" } + - { session: doctest, python-version: "3.12", os: "ubuntu-latest" } + - { session: mypy, python-version: "3.12", os: "ubuntu-latest" } + - { session: deps, python-version: "3.12", os: "ubuntu-latest" } steps: - uses: actions/checkout@v4 @@ -91,8 +90,6 @@ jobs: nox --version - name: Run Nox - env: - SQLALCHEMY_VERSION: ${{ matrix.sqlalchemy }} run: | nox --verbose diff --git a/noxfile.py b/noxfile.py index 92567eca0..0750aafc8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -64,14 +64,6 @@ def tests(session: Session) -> None: session.install(".[faker,jwt,parquet,s3]") session.install(*test_dependencies) - sqlalchemy_version = os.environ.get("SQLALCHEMY_VERSION") - if sqlalchemy_version: - # Bypass nox-poetry use of --constraint so we can install a version of - # SQLAlchemy that doesn't match what's in poetry.lock. - session.poetry.session.install( # type: ignore[attr-defined] - f"sqlalchemy=={sqlalchemy_version}.*", - ) - env = {"COVERAGE_CORE": "sysmon"} if session.python == "3.12" else {} try: diff --git a/tests/conftest.py b/tests/conftest.py index d2961722f..03c62831d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,7 +8,6 @@ import typing as t import pytest -import sqlalchemy as sa from singer_sdk import SQLConnector from singer_sdk import typing as th @@ -44,11 +43,6 @@ def pytest_runtest_setup(item): pytest.skip(f"cannot run on platform {system}") -def pytest_report_header() -> list[str]: - """Return a list of strings to be displayed in the header of the report.""" - return [f"sqlalchemy: {sa.__version__}"] - - @pytest.fixture(autouse=True) def _reset_envvars(monkeypatch: pytest.MonkeyPatch): """Remove envvars that might interfere with tests."""