Skip to content

Commit

Permalink
fix!: Drop support for SQLAlchemy 1.4 (#1916)
Browse files Browse the repository at this point in the history
  • Loading branch information
edgarrmondragon committed May 7, 2024
1 parent 86e249d commit 8305d26
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,12 +49,10 @@ jobs:
session: [tests]
os: ["ubuntu-latest", "macos-13", "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: tests, python-version: "3.12", os: "macos-latest", sqlalchemy: "2" }
- { session: doctest, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "2" }
- { session: mypy, python-version: "3.12", os: "ubuntu-latest", sqlalchemy: "2" }
- { session: tests, python-version: "3.12", os: "macos-latest" }
- { session: doctest, python-version: "3.12", os: "ubuntu-latest" }
- { session: mypy, python-version: "3.12", os: "ubuntu-latest" }

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -92,8 +90,6 @@ jobs:
nox --version
- name: Run Nox
env:
SQLALCHEMY_VERSION: ${{ matrix.sqlalchemy }}
run: |
nox --verbose
Expand Down
8 changes: 0 additions & 8 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,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:
Expand Down
6 changes: 0 additions & 6 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."""
Expand Down

0 comments on commit 8305d26

Please sign in to comment.