bump black to 22.3.0

both black and click were released in the past
few hours, and black 21.5b1 seems to suddenly
be failing on a missing symbol from click.  just
update to the latest

Change-Id: Idf76732479a264f7f2245699a6bdaff018e3a123

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b888441fd470d6183cdf218aacba9d1cf43ab924..1fb27f86d8bc22cf6b89c6a136771ed1369c1509 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/python/black
-    rev: 21.12b0
+    rev: 22.3.0
     hooks:
     -   id: black
 

diff --git a/examples/versioned_rows/versioned_rows_w_versionid.py b/examples/versioned_rows/versioned_rows_w_versionid.py
index 39cbaf1aa69dad1d545754c0d5450bc4c8403d08..fcf8082814ad9eed94150929a9ead908fc962be3 100644 (file)
--- a/examples/versioned_rows/versioned_rows_w_versionid.py
+++ b/examples/versioned_rows/versioned_rows_w_versionid.py
@@ -101,17 +101,14 @@ session.commit()
 e1.data = "e2"
 session.commit()
 
-assert (
-    session.query(
-        Example.id,
-        Example.version_id,
-        Example.is_current_version,
-        Example.calc_is_current_version,
-        Example.data,
-    )
-    .order_by(Example.id, Example.version_id)
-    .all()
-    == ([(1, 1, False, False, "e1"), (1, 2, True, True, "e2")])
+assert session.query(
+    Example.id,
+    Example.version_id,
+    Example.is_current_version,
+    Example.calc_is_current_version,
+    Example.data,
+).order_by(Example.id, Example.version_id).all() == (
+    [(1, 1, False, False, "e1"), (1, 2, True, True, "e2")]
 )
 
 # example 2, versioning with a parent
@@ -162,15 +159,12 @@ session.commit()
 assert p1.child_id == 1
 assert p1.child.version_id == 2
 
-assert (
-    session.query(
-        Child.id,
-        Child.version_id,
-        Child.is_current_version,
-        Child.calc_is_current_version,
-        Child.data,
-    )
-    .order_by(Child.id, Child.version_id)
-    .all()
-    == ([(1, 1, False, False, "c1"), (1, 2, True, True, "c2")])
+assert session.query(
+    Child.id,
+    Child.version_id,
+    Child.is_current_version,
+    Child.calc_is_current_version,
+    Child.data,
+).order_by(Child.id, Child.version_id).all() == (
+    [(1, 1, False, False, "c1"), (1, 2, True, True, "c2")]
 )

diff --git a/lib/sqlalchemy/dialects/mysql/enumerated.py b/lib/sqlalchemy/dialects/mysql/enumerated.py
index c35b7226d8dc20e5da12a1970925bd9999b6f38e..753f591e9abe8d4acfad004eafac94816909a093 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/enumerated.py
+++ b/lib/sqlalchemy/dialects/mysql/enumerated.py
@@ -152,10 +152,10 @@ class SET(_StringType):
             )
         if self.retrieve_as_bitwise:
             self._bitmap = dict(
-                (value, 2 ** idx) for idx, value in enumerate(self.values)
+                (value, 2**idx) for idx, value in enumerate(self.values)
             )
             self._bitmap.update(
-                (2 ** idx, value) for idx, value in enumerate(self.values)
+                (2**idx, value) for idx, value in enumerate(self.values)
             )
         length = max([len(v) for v in values] + [0])
         kw.setdefault("length", length)

diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index 98181051e5832fb8260490569dd394f25c9a34be..5208f96718b4b39baa1e74141e8ccf01e739ed88 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -1266,7 +1266,7 @@ class OracleDialect_cx_oracle(OracleDialect):
 
         """
 
-        id_ = random.randint(0, 2 ** 128)
+        id_ = random.randint(0, 2**128)
         return (0x1234, "%032x" % id_, "%032x" % 9)
 
     def do_executemany(self, cursor, statement, parameters, context=None):

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index d605af3efa063326f7b4ec351679945c77485ee2..65cb57e10a57d4e829767b05841bfc616b7d6f76 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -630,7 +630,7 @@ class DefaultDialect(Dialect):
         do_commit_twophase().  Its format is unspecified.
         """
 
-        return "_sa_%032x" % random.randint(0, 2 ** 128)
+        return "_sa_%032x" % random.randint(0, 2**128)
 
     def do_savepoint(self, connection, name):
         connection.execute(expression.SavepointClause(name))

diff --git a/lib/sqlalchemy/sql/coercions.py b/lib/sqlalchemy/sql/coercions.py
index ea17b8e0377e822a07c984d24ec12e63cd528d92..35cd33a1867f5a0eed72a6a04dd6e5f77f464c26 100644 (file)
--- a/lib/sqlalchemy/sql/coercions.py
+++ b/lib/sqlalchemy/sql/coercions.py
@@ -64,13 +64,10 @@ def _is_literal(element):
 
     """
 
-    return (
-        not isinstance(
-            element,
-            (Visitable, schema.SchemaEventTarget),
-        )
-        and not hasattr(element, "__clause_element__")
-    )
+    return not isinstance(
+        element,
+        (Visitable, schema.SchemaEventTarget),
+    ) and not hasattr(element, "__clause_element__")
 
 
 def _deep_is_literal(element):

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 9924e632bf8a49d4ee1616517b3d089a4d0b1b58..7206cfdbab451adf6ce644562dfa95b830df624c 100644 (file)
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -4329,14 +4329,10 @@ class PrimaryKeyConstraint(ColumnCollectionConstraint):
             if col.autoincrement is True:
                 _validate_autoinc(col, True)
                 return col
-            elif (
-                col.autoincrement
-                in (
-                    "auto",
-                    "ignore_fk",
-                )
-                and _validate_autoinc(col, False)
-            ):
+            elif col.autoincrement in (
+                "auto",
+                "ignore_fk",
+            ) and _validate_autoinc(col, False):
                 return col
 
         else:

diff --git a/test/dialect/mysql/test_types.py b/test/dialect/mysql/test_types.py
index de93a97a4a78b58f4eccd7c719e509f3107ca5ea..8e7c6ce4634a1fcccfe0248e3ab7ebfdf0350d0c 100644 (file)
--- a/test/dialect/mysql/test_types.py
+++ b/test/dialect/mysql/test_types.py
@@ -537,7 +537,7 @@ class TypeRoundTripTest(fixtures.TestBase, AssertsExecutionResults):
         )
         return bit_table
 
-    i, j, k, l = 255, 2 ** 32 - 1, 2 ** 63 - 1, 2 ** 64 - 1
+    i, j, k, l = 255, 2**32 - 1, 2**63 - 1, 2**64 - 1
 
     @testing.combinations(
         (([0] * 8), None),

diff --git a/test/dialect/oracle/test_reflection.py b/test/dialect/oracle/test_reflection.py
index 215f4ecd5dc0b09ac97f5777582026f14da59a42..08d727cb0dfd5f684ec5f08e966ed296d856806a 100644 (file)
--- a/test/dialect/oracle/test_reflection.py
+++ b/test/dialect/oracle/test_reflection.py
@@ -846,7 +846,7 @@ class IdentityReflectionTest(fixtures.TablesTest):
             "start": 1,
             "increment": 1,
             "on_null": False,
-            "maxvalue": 10 ** 28 - 1,
+            "maxvalue": 10**28 - 1,
             "minvalue": 1,
             "cycle": False,
             "cache": 20,

diff --git a/test/dialect/postgresql/test_reflection.py b/test/dialect/postgresql/test_reflection.py
index 9c286145b7a3a417ce817535ef511c7e913f387f..cbb1809e4db77f3cab011b2cddcafa2f7e7fcae2 100644 (file)
--- a/test/dialect/postgresql/test_reflection.py
+++ b/test/dialect/postgresql/test_reflection.py
@@ -1939,15 +1939,15 @@ class IdentityReflectionTest(fixtures.TablesTest):
             elif col["name"] == "id2":
                 is_true("identity" in col)
                 exp = default.copy()
-                exp.update(maxvalue=2 ** 31 - 1)
+                exp.update(maxvalue=2**31 - 1)
                 eq_(col["identity"], exp)
             elif col["name"] == "id3":
                 is_true("identity" in col)
                 exp = default.copy()
-                exp.update(maxvalue=2 ** 63 - 1)
+                exp.update(maxvalue=2**63 - 1)
                 eq_(col["identity"], exp)
             elif col["name"] == "id4":
                 is_true("identity" in col)
                 exp = default.copy()
-                exp.update(maxvalue=2 ** 15 - 1)
+                exp.update(maxvalue=2**15 - 1)
                 eq_(col["identity"], exp)

diff --git a/test/ext/mypy/test_mypy_plugin_py3k.py b/test/ext/mypy/test_mypy_plugin_py3k.py
index 6df21e46c05f609ce37217ba828edc7ec6862cb0..daa8a857793a89d798c3bdf768864f078962a887 100644 (file)
--- a/test/ext/mypy/test_mypy_plugin_py3k.py
+++ b/test/ext/mypy/test_mypy_plugin_py3k.py
@@ -281,7 +281,7 @@ class MypyPluginTest(fixtures.TestBase):
                 for idx, (typ, errmsg) in enumerate(output):
                     if is_re:
                         if re.match(
-                            fr".*{filename}\:{num}\: {typ}\: {prefix}{msg}",  # noqa E501
+                            rf".*{filename}\:{num}\: {typ}\: {prefix}{msg}",  # noqa E501
                             errmsg,
                         ):
                             break

diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py
index f2700513b7536ae1b1156979683cef7e5d59cf1a..0dc71f8b3ac587f2f3a3c9459fb3a5954a37daf3 100644 (file)
--- a/test/orm/test_naturalpks.py
+++ b/test/orm/test_naturalpks.py
@@ -270,13 +270,10 @@ class NaturalPKTest(fixtures.MappedTest):
             # test passive_updates=True; update user
             self.assert_sql_count(testing.db, go, 1)
         sess.expunge_all()
-        assert (
-            User(
-                username="jack",
-                addresses=[Address(username="jack"), Address(username="jack")],
-            )
-            == sess.get(User, "jack")
-        )
+        assert User(
+            username="jack",
+            addresses=[Address(username="jack"), Address(username="jack")],
+        ) == sess.get(User, "jack")
 
         u1 = sess.get(User, "jack")
         u1.addresses = []
@@ -1135,13 +1132,10 @@ class NonPKCascadeTest(fixtures.MappedTest):
             # test passive_updates=True; update user
             self.assert_sql_count(testing.db, go, 1)
         sess.expunge_all()
-        assert (
-            User(
-                username="jack",
-                addresses=[Address(username="jack"), Address(username="jack")],
-            )
-            == sess.get(User, u1.id)
-        )
+        assert User(
+            username="jack",
+            addresses=[Address(username="jack"), Address(username="jack")],
+        ) == sess.get(User, u1.id)
         sess.expunge_all()
 
         u1 = sess.get(User, u1.id)

diff --git a/tox.ini b/tox.ini
index 961add4b0dca7143f3912f0242858ece561ff3aa..444e3fb35d783be1450abc1b5b132ed2df03ad15 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -165,7 +165,7 @@ deps=
       # in case it requires a version pin
       pydocstyle
       pygments
-      black==21.12b0
+      black==22.3.0
       slotscheck>=0.12,<0.13
 
       # this is to satisfy the mypy plugin dependency