chore: standardize noxfile sessions and parameters

Author: chalmerlowe

packages/sqlalchemy-spanner/noxfile.py

@@ -76,9 +76,13 @@ class = StreamHandler
 
 
 BLACK_VERSION = "black==23.7.0"
+ISORT_VERSION = "isort==5.11.0"
 BLACK_PATHS = ["google", "test", "noxfile.py", "setup.py", "samples"]
-UNIT_TEST_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
-SYSTEM_TEST_PYTHON_VERSIONS = ["3.9", "3.14"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+ALL_PYTHON = list(UNIT_TEST_PYTHON_VERSIONS)
+ALL_PYTHON.extend(["3.7"])
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.12"]
+SYSTEM_COMPLIANCE_MIGRATION_TEST_PYTHON_VERSIONS = ["3.8", "3.12", "3.14"]
 DEFAULT_PYTHON_VERSION = "3.14"
 DEFAULT_PYTHON_VERSION_FOR_SQLALCHEMY_20 = "3.14"
 
@@ -209,62 +213,6 @@ def compliance_test_20(session):
     )
 
 
-@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
-def system(session):
-    """Run SQLAlchemy dialect system test suite."""
-
-    # Sanity check: Only run tests if the environment variable is set.
-    if not os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", "") and not os.environ.get(
-        "SPANNER_EMULATOR_HOST", ""
-    ):
-        session.skip(
-            "Credentials or emulator host must be set via environment variable"
-        )
-
-    if os.environ.get("RUN_COMPLIANCE_TESTS", "true") == "false" and not os.environ.get(
-        "SPANNER_EMULATOR_HOST", ""
-    ):
-        session.skip("RUN_COMPLIANCE_TESTS is set to false, skipping")
-
-    session.install(
-        "pytest",
-        "pytest-cov",
-        "pytest-asyncio",
-    )
-
-    session.install("mock")
-    session.install(".[tracing]")
-    session.install("opentelemetry-api")
-    session.install("opentelemetry-sdk")
-    session.install("opentelemetry-instrumentation")
-    session.run("python", "create_test_database.py")
-
-    session.install("sqlalchemy>=2.0")
-
-    session.run("py.test", "--quiet", os.path.join("test", "system"), *session.posargs)
-
-    session.run("python", "drop_test_database.py")
-
-
-@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
-def unit(session):
-    """Run unit tests."""
-    if session.python in ("3.7",):
-        session.skip("Python 3.7 is no longer supported")
-    # Run SQLAlchemy dialect compliance test suite with OpenTelemetry.
-    session.install("setuptools")
-    session.install("pytest")
-    session.install("mock")
-    session.install(".")
-    session.install("opentelemetry-api")
-    session.install("opentelemetry-sdk")
-    session.install("opentelemetry-instrumentation")
-    session.run(
-        "python", "create_test_config.py", "my-project", "my-instance", "my-database"
-    )
-    session.run("py.test", "--quiet", os.path.join("test/unit"), *session.posargs)
-
-
 @nox.session(python=DEFAULT_PYTHON_VERSION_FOR_SQLALCHEMY_20)
 def mockserver(session):
     """Run mockserver tests."""
@@ -372,3 +320,99 @@ def snippets(session):
         os.path.join("samples", "snippets_test.py"),
         *session.posargs,
     )
+
+@nox.session(python=ALL_PYTHON)
+@nox.parametrize("test_type", ["unit", "mockserver"])
+def unit(session, test_type):
+    """Run unit tests."""
+    if session.python in ("3.7",):
+        session.skip("Python 3.7 is no longer supported")
+
+    if test_type == "mockserver" and session.python != DEFAULT_PYTHON_VERSION_FOR_SQLALCHEMY_20:
+        session.skip("mockserver tests only run on python 3.14")
+        
+    if test_type == "mockserver":
+        mockserver(session)
+        return
+
+    if test_type == "unit":
+        # Run SQLAlchemy dialect compliance test suite with OpenTelemetry.
+        session.install("setuptools")
+        session.install("pytest")
+        session.install("mock")
+        session.install(".")
+        session.install("opentelemetry-api")
+        session.install("opentelemetry-sdk")
+        session.install("opentelemetry-instrumentation")
+        session.run(
+            "python", "create_test_config.py", "my-project", "my-instance", "my-database"
+        )
+        session.run("py.test", "--quiet", os.path.join("test/unit"), *session.posargs)
+        return
+
+@nox.session(python=SYSTEM_COMPLIANCE_MIGRATION_TEST_PYTHON_VERSIONS)
+@nox.parametrize("test_type", ["system", "compliance_14", "compliance_20", "migration_14", "migration_20"])
+def system(session, test_type):
+    """Run SQLAlchemy dialect system test suite."""
+
+    if not os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", "") and not os.environ.get(
+        "SPANNER_EMULATOR_HOST", ""
+    ):
+        session.skip(
+            "Credentials or emulator host must be set via environment variable"
+        )
+
+    if os.environ.get("RUN_COMPLIANCE_TESTS", "true") == "false" and not os.environ.get(
+        "SPANNER_EMULATOR_HOST", ""
+    ):
+        session.skip("RUN_COMPLIANCE_TESTS is set to false, skipping")
+
+    if test_type == "system" and session.python not in SYSTEM_TEST_PYTHON_VERSIONS:
+        session.skip("Standard system tests configured to run exclusively on 3.12")
+    if test_type in ["compliance_14", "migration_14"] and session.python != UNIT_TEST_PYTHON_VERSIONS[0]:
+        session.skip(f"SQLAlchemy 1.4-based tests configured to run exclusively on {UNIT_TEST_PYTHON_VERSIONS[0]}")
+    if test_type in ["compliance_20", "migration_20"] and session.python != DEFAULT_PYTHON_VERSION_FOR_SQLALCHEMY_20:
+        session.skip(f"SQLAlchemy 2.0-based tests configured to run exclusively on {DEFAULT_PYTHON_VERSION_FOR_SQLALCHEMY_20}")
+
+    if test_type == "system":
+        session.install("pytest", "pytest-cov", "pytest-asyncio")
+        session.install("mock")
+        session.install(".[tracing]")
+        session.install("opentelemetry-api")
+        session.install("opentelemetry-sdk")
+        session.install("opentelemetry-instrumentation")
+        session.run("python", "create_test_database.py")
+        session.install("sqlalchemy>=2.0")
+        session.run("py.test", "--quiet", os.path.join("test", "system"), *session.posargs)
+        session.run("python", "drop_test_database.py")
+    elif test_type == "compliance_14":
+        compliance_test_14(session)
+    elif test_type == "compliance_20":
+        compliance_test_20(session)
+    elif test_type == "migration_14":
+        migration_test(session)
+    elif test_type == "migration_20":
+        _migration_test(session)
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def mypy(session):
+    """Run the type checker."""
+    session.skip("mypy tests are not yet supported")
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def core_deps_from_source(session):
+    """Run all tests with core dependencies installed from source"""
+    session.skip("Core deps from source tests are not yet supported")
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def prerelease_deps(session):
+    """Run all tests with prerelease versions of dependencies installed."""
+    session.skip("prerelease deps tests are not yet supported")
+
+@nox.session
+def format(session: nox.sessions.Session) -> None:
+    session.install(BLACK_VERSION, ISORT_VERSION)
+    import os
+    python_files = [path for path in os.listdir(".") if path.endswith(".py")]
+    session.run("isort", "--fss", *python_files)
+    session.run("black", *python_files)

packages/sqlalchemy-spanner/setup.py

@@ -17,7 +17,6 @@
 
 import setuptools
 
-
 # Package metadata.
 
 name = "sqlalchemy-spanner"
@@ -62,6 +61,7 @@
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",