Format existing code with ruff

Author: cjw296

pytest_sqlalchemy.py

@@ -11,13 +11,17 @@
 
 
 @pytest.fixture(scope="session")
-def engine(request: FixtureRequest, sqlalchemy_connect_url: Optional[str], app_config: Optional[Dict[str, str]]) -> Engine:
+def engine(
+    request: FixtureRequest,
+    sqlalchemy_connect_url: Optional[str],
+    app_config: Optional[Dict[str, str]],
+) -> Engine:
     """Engine configuration.
     See http://docs.sqlalchemy.org/en/latest/core/engines.html
     for more details.
 
     :sqlalchemy_connect_url: Connection URL to the database. E.g
-    postgresql://scott:tiger@localhost:5432/mydatabase 
+    postgresql://scott:tiger@localhost:5432/mydatabase
     :app_config: Path to a ini config file containing the sqlalchemy.url
     config variable in the DEFAULT section.
     :returns: Engine instance
@@ -38,15 +42,17 @@ def engine(request: FixtureRequest, sqlalchemy_connect_url: Optional[str], app_c
         engine = create_engine(url)  # override engine
 
     def fin() -> None:
-        print ("Disposing engine")
+        print("Disposing engine")
         engine.dispose()
 
     request.addfinalizer(fin)
     return engine
 
 
 @pytest.fixture(scope="session")
-def db_schema(request: FixtureRequest, engine: Engine, sqlalchemy_manage_db: bool, sqlalchemy_keep_db: bool) -> Optional[None]:
+def db_schema(
+    request: FixtureRequest, engine: Engine, sqlalchemy_manage_db: bool, sqlalchemy_keep_db: bool
+) -> Optional[None]:
     if not sqlalchemy_manage_db:
         return
 
@@ -58,8 +64,9 @@ def db_schema(request: FixtureRequest, engine: Engine, sqlalchemy_manage_db: boo
         sqlalchemy_utils.functions.create_database(engine.url)
 
     if not sqlalchemy_keep_db:
+
         def fin() -> None:
-            print ("Tearing down DB")
+            print("Tearing down DB")
             sqlalchemy_utils.functions.drop_database(engine.url)
 
         request.addfinalizer(fin)
@@ -70,7 +77,7 @@ def connection(request: FixtureRequest, engine: Engine, db_schema: Optional[None
     connection = engine.connect()
 
     def fin() -> None:
-        print ("Closing connection")
+        print("Closing connection")
         connection.close()
 
     request.addfinalizer(fin)
@@ -84,7 +91,7 @@ def transaction(request: FixtureRequest, connection: Connection) -> Connection:
     transaction = connection.begin()
 
     def fin() -> None:
-        print ("Rollback")
+        print("Rollback")
         transaction.rollback()
 
     request.addfinalizer(fin)
@@ -94,6 +101,7 @@ def fin() -> None:
 @pytest.fixture()
 def dbsession(request: FixtureRequest, connection: Connection) -> Any:
     from sqlalchemy.orm import sessionmaker
+
     return sessionmaker()(bind=connection)
 
 
@@ -136,22 +144,33 @@ def app_config(request: FixtureRequest) -> Optional[Mapping[str, str]]:
 
 
 def pytest_addoption(parser: Parser) -> None:
-    parser.addoption("--sqlalchemy-connect-url", action="store",
-                     default=None,
-                     help="Name of the database to connect to")
-
-    parser.addoption("--sqlalchemy-config-file", action="store",
-                     default=None,
-                     help="Path to a config file containing the "
-                     "'sqlalchemy.url' variable in the DEFAULT section "
-                     "of a ini file to define the connect "
-                     "url.")
-
-    parser.addoption("--sqlalchemy-manage-db", action="store_true",
-                     default=None,
-                     help="Automatically creates and drops database")
-
-    parser.addoption("--sqlalchemy-keep-db", action="store_true",
-                     default=None,
-                     help="Do not delete database after test suite, "
-                     "allowing for its reuse.")
+    parser.addoption(
+        "--sqlalchemy-connect-url",
+        action="store",
+        default=None,
+        help="Name of the database to connect to",
+    )
+
+    parser.addoption(
+        "--sqlalchemy-config-file",
+        action="store",
+        default=None,
+        help="Path to a config file containing the "
+        "'sqlalchemy.url' variable in the DEFAULT section "
+        "of a ini file to define the connect "
+        "url.",
+    )
+
+    parser.addoption(
+        "--sqlalchemy-manage-db",
+        action="store_true",
+        default=None,
+        help="Automatically creates and drops database",
+    )
+
+    parser.addoption(
+        "--sqlalchemy-keep-db",
+        action="store_true",
+        default=None,
+        help="Do not delete database after test suite, allowing for its reuse.",
+    )

tests/examples/test_xdist.py

@@ -1,9 +1,11 @@
 from sqlalchemy.engine import Engine
 
+
 def test_one(engine: Engine) -> None:
     db_name = str(engine.url.database) if engine.url.database is not None else ""
     assert '_gw' in db_name
 
+
 def test_two(engine: Engine) -> None:
     db_name = str(engine.url.database) if engine.url.database is not None else ""
     assert '_gw' in db_name

tests/test_plugin.py

@@ -28,9 +28,7 @@ def test_dbsession_fixture(pytester: Pytester, db_url: str) -> None:
 def test_db_schema(pytester: Pytester, new_db_url: str) -> None:
     assert not database_exists(new_db_url)
     pytester.copy_example("tests/examples/test_db_schema.py")
-    result = pytester.runpytest(
-        '--sqlalchemy-connect-url', new_db_url, '--sqlalchemy-manage-db'
-    )
+    result = pytester.runpytest('--sqlalchemy-connect-url', new_db_url, '--sqlalchemy-manage-db')
     result.assert_outcomes(passed=1)
     assert not database_exists(new_db_url)
 
@@ -39,9 +37,7 @@ def test_db_exists_no_keep_db(pytester: Pytester, db_url: str) -> None:
     if not database_exists(db_url):
         create_database(db_url)
     pytester.copy_example("tests/examples/test_db_schema.py")
-    result = pytester.runpytest(
-        '--sqlalchemy-connect-url', db_url, '--sqlalchemy-manage-db'
-    )
+    result = pytester.runpytest('--sqlalchemy-connect-url', db_url, '--sqlalchemy-manage-db')
     result.assert_outcomes(errors=1)
     assert "DB exists, remove it before proceeding" in result.stdout.str()
     assert database_exists(db_url)
@@ -95,14 +91,16 @@ def test_xdist_naming(pytester: Pytester, db_url: str, request: FixtureRequest)
     # Measuring coverage when running under xdist is pretty tricky:
     if running_under_coverage:
         pyproject_toml = Path(__file__).parent.parent / "pyproject.toml"
-        pytester.makeconftest(dedent(f"""
+        pytester.makeconftest(
+            dedent(f"""
             import coverage, os, sys
             def pytest_configure(config):
                 worker_id = os.environ.get("PYTEST_XDIST_WORKER")
                 if worker_id is not None:
                     os.environ["COVERAGE_PROCESS_START"] = "{pyproject_toml}"
                     coverage.process_startup()
-        """))
+        """)
+        )
     pytester.copy_example("tests/examples/test_xdist.py")
     result = pytester.runpytest('-n', '2', '--sqlalchemy-connect-url', db_url)
     result.assert_outcomes(passed=2)