Avoid lint errors and SQLA version mismatch in CI

Author: gordthompson

pyproject.toml

@@ -9,14 +9,17 @@ authors = [
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
- "sqlalchemy (>=2.0.41,<3.0.0)"
+ "sqlalchemy (>=2.0.40,<3.0.0)"
 ]
 
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.black]
+line-length = 100
+
 [tool.poetry.group.dev.dependencies]
 alembic = "1.15.2"
 async-timeout = "5.0.1"

sqlalchemy_cockroachdb/transaction.py

@@ -98,11 +98,13 @@ def retry_exponential_backoff(retry_count: int, max_backoff: int = 0) -> None:
  :return: None
  """
 
- sleep_secs = uniform(0, min(max_backoff, 0.1 * (2 ** retry_count)))
+ sleep_secs = uniform(0, min(max_backoff, 0.1 * (2**retry_count)))
  sleep(sleep_secs)
 
 
-def run_in_nested_transaction(conn, callback, max_retries, max_backoff, inject_error=False, **kwargs):
+def run_in_nested_transaction(
+ conn, callback, max_retries, max_backoff, inject_error=False, **kwargs
+):
  if isinstance(conn, sqlalchemy.orm.Session):
  dbapi_name = conn.bind.driver
  else:
@@ -124,11 +126,13 @@ def run_in_nested_transaction(conn, callback, max_retries, max_backoff, inject_e
  if dbapi_name == "psycopg2":
  import psycopg2
  import psycopg2.errorcodes
+
  if isinstance(e.orig, psycopg2.OperationalError):
  if e.orig.pgcode == psycopg2.errorcodes.SERIALIZATION_FAILURE:
  do_retry = True
  else:
  import psycopg
+
  if isinstance(e.orig, psycopg.errors.SerializationFailure):
  do_retry = True
  if do_retry:
@@ -149,5 +153,7 @@ def _txn_retry_loop(conn, callback, max_retries, max_backoff, **kwargs):
  result = run_in_nested_transaction(conn, callback, max_retries, max_backoff, **kwargs)
  if isinstance(result, ChainTransaction):
  for transaction in result.transactions:
- result.add_result(run_in_nested_transaction(conn, transaction, max_retries, max_backoff, **kwargs))
+ result.add_result(
+ run_in_nested_transaction(conn, transaction, max_retries, max_backoff, **kwargs)
+ )
  return result

test/test_run_transaction_core.py

@@ -3,7 +3,7 @@
 from sqlalchemy.testing import fixtures
 from sqlalchemy.types import Integer
 import threading
-from sqlalchemy.orm import sessionmaker, scoped_session, relationship
+from sqlalchemy.orm import sessionmaker, scoped_session
 
 
 from sqlalchemy_cockroachdb import run_transaction
@@ -140,7 +140,6 @@ def txn_body(conn):
  rs = run_transaction(conn, txn_body)
  assert rs[0] == (1, 100)
 
-
  def test_run_transaction_retry_with_nested(self):
  def txn_body(conn):
  rs = conn.execute(text("select acct, balance from account where acct = 1"))
@@ -151,25 +150,22 @@ def txn_body(conn):
  rs = run_transaction(conn, txn_body, use_cockroach_restart=False)
  assert rs[0] == (1, 100)
 
-
  def test_run_chained_transaction(self):
  def txn_body(conn):
  # first transaction inserts
- conn.execute(
- account_table.insert(), [dict(acct=99, balance=100)]
- )
+ conn.execute(account_table.insert(), [dict(acct=99, balance=100)])
  conn.execute(text("select crdb_internal.force_retry('1s')"))
 
  def _get_val(s):
  rs = s.execute(text("select acct, balance from account where acct = 99"))
  return [r for r in rs]
 
- # chain the get into a separate nested transaction, so that the value 
+ # chain the get into a separate nested transaction, so that the value
  # in the previous nested transaction is flushed and available
- return ChainTransaction([lambda s : _get_val(s), lambda s : _get_val(s)])
+ return ChainTransaction([lambda s: _get_val(s), lambda s: _get_val(s)])
 
  with testing.db.connect() as conn:
  rs = run_transaction(conn, txn_body, use_cockroach_restart=False)
  assert len(rs.results) == 2
- assert rs.results[0][0] == (99,100)
- assert rs.results[1][0] == (99,100)
+ assert rs.results[0][0] == (99, 100)
+ assert rs.results[1][0] == (99, 100)