Ruff PT018: broke up multi-part asserts

Author: evertlammerts

tests/fast/api/test_native_tz.py

@@ -16,20 +16,24 @@ class TestNativeTimeZone:
     def test_native_python_timestamp_timezone(self, duckdb_cursor):
         duckdb_cursor.execute("SET timezone='America/Los_Angeles';")
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetchone()
-        assert res[0].hour == 14 and res[0].minute == 52
+        assert res[0].hour == 14
+        assert res[0].minute == 52
         assert res[0].tzinfo.zone == "America/Los_Angeles"
 
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetchall()[0]
-        assert res[0].hour == 14 and res[0].minute == 52
+        assert res[0].hour == 14
+        assert res[0].minute == 52
         assert res[0].tzinfo.zone == "America/Los_Angeles"
 
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetchmany(1)[0]
-        assert res[0].hour == 14 and res[0].minute == 52
+        assert res[0].hour == 14
+        assert res[0].minute == 52
         assert res[0].tzinfo.zone == "America/Los_Angeles"
 
         duckdb_cursor.execute("SET timezone='UTC';")
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetchone()
-        assert res[0].hour == 21 and res[0].minute == 52
+        assert res[0].hour == 21
+        assert res[0].minute == 52
         assert res[0].tzinfo.zone == "UTC"
 
     def test_native_python_time_timezone(self, duckdb_cursor):
@@ -43,11 +47,13 @@ def test_pandas_timestamp_timezone(self, duckdb_cursor):
         res = duckdb_cursor.execute("SET timezone='America/Los_Angeles';")
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").df()
         assert res.dtypes["tz"].tz.zone == "America/Los_Angeles"
-        assert res["tz"][0].hour == 14 and res["tz"][0].minute == 52
+        assert res["tz"][0].hour == 14
+        assert res["tz"][0].minute == 52
 
         duckdb_cursor.execute("SET timezone='UTC';")
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").df()
-        assert res["tz"][0].hour == 21 and res["tz"][0].minute == 52
+        assert res["tz"][0].hour == 21
+        assert res["tz"][0].minute == 52
 
     def test_pandas_timestamp_time(self, duckdb_cursor):
         with pytest.raises(
@@ -63,12 +69,14 @@ def test_arrow_timestamp_timezone(self, duckdb_cursor):
         table = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetch_arrow_table()
         res = table.to_pandas()
         assert res.dtypes["tz"].tz.zone == "America/Los_Angeles"
-        assert res["tz"][0].hour == 14 and res["tz"][0].minute == 52
+        assert res["tz"][0].hour == 14
+        assert res["tz"][0].minute == 52
 
         duckdb_cursor.execute("SET timezone='UTC';")
         res = duckdb_cursor.execute(f"select TimeRecStart as tz  from '{filename}'").fetch_arrow_table().to_pandas()
         assert res.dtypes["tz"].tz.zone == "UTC"
-        assert res["tz"][0].hour == 21 and res["tz"][0].minute == 52
+        assert res["tz"][0].hour == 21
+        assert res["tz"][0].minute == 52
 
     def test_arrow_timestamp_time(self, duckdb_cursor):
         duckdb_cursor.execute("SET timezone='America/Los_Angeles';")
@@ -82,8 +90,10 @@ def test_arrow_timestamp_time(self, duckdb_cursor):
             .fetch_arrow_table()
             .to_pandas()
         )
-        assert res1["tz"][0].hour == 14 and res1["tz"][0].minute == 52
-        assert res2["tz"][0].hour == res2["tz"][0].hour and res2["tz"][0].minute == res1["tz"][0].minute
+        assert res1["tz"][0].hour == 14
+        assert res1["tz"][0].minute == 52
+        assert res2["tz"][0].hour == res2["tz"][0].hour
+        assert res2["tz"][0].minute == res1["tz"][0].minute
 
         duckdb_cursor.execute("SET timezone='UTC';")
         res1 = (
@@ -96,5 +106,7 @@ def test_arrow_timestamp_time(self, duckdb_cursor):
             .fetch_arrow_table()
             .to_pandas()
         )
-        assert res1["tz"][0].hour == 21 and res1["tz"][0].minute == 52
-        assert res2["tz"][0].hour == res2["tz"][0].hour and res2["tz"][0].minute == res1["tz"][0].minute
+        assert res1["tz"][0].hour == 21
+        assert res1["tz"][0].minute == 52
+        assert res2["tz"][0].hour == res2["tz"][0].hour
+        assert res2["tz"][0].minute == res1["tz"][0].minute

tests/fast/arrow/test_arrow_version_format.py

@@ -21,7 +21,8 @@ def test_decimal_v1_5(self, duckdb_cursor):
             pa.schema([("data", pa.decimal32(5, 2))]),
         )
         col_type = duckdb_cursor.execute("FROM decimal_32").fetch_arrow_table().schema.field("data").type
-        assert col_type.bit_width == 32 and pa.types.is_decimal(col_type)
+        assert col_type.bit_width == 32
+        assert pa.types.is_decimal(col_type)
 
         decimal_64 = pa.Table.from_pylist(  # noqa: F841
             [
@@ -33,19 +34,22 @@ def test_decimal_v1_5(self, duckdb_cursor):
             pa.schema([("data", pa.decimal64(16, 3))]),
         )
         col_type = duckdb_cursor.execute("FROM decimal_64").fetch_arrow_table().schema.field("data").type
-        assert col_type.bit_width == 64 and pa.types.is_decimal(col_type)
+        assert col_type.bit_width == 64
+        assert pa.types.is_decimal(col_type)
         for version in ["1.0", "1.1", "1.2", "1.3", "1.4"]:
             duckdb_cursor.execute(f"SET arrow_output_version = {version}")
             result = duckdb_cursor.execute("FROM decimal_32").fetch_arrow_table()
             col_type = result.schema.field("data").type
-            assert col_type.bit_width == 128 and pa.types.is_decimal(col_type)
+            assert col_type.bit_width == 128
+            assert pa.types.is_decimal(col_type)
             assert result.to_pydict() == {
                 "data": [Decimal("100.20"), Decimal("110.21"), Decimal("31.20"), Decimal("500.20")]
             }
 
             result = duckdb_cursor.execute("FROM decimal_64").fetch_arrow_table()
             col_type = result.schema.field("data").type
-            assert col_type.bit_width == 128 and pa.types.is_decimal(col_type)
+            assert col_type.bit_width == 128
+            assert pa.types.is_decimal(col_type)
             assert result.to_pydict() == {
                 "data": [Decimal("1000.231"), Decimal("1100.231"), Decimal("999999999999.231"), Decimal("500.200")]
             }

tests/fast/spark/test_spark_filter.py

@@ -81,7 +81,8 @@ def test_dataframe_filter(self, spark):
         res = df2.collect()
         assert len(res) == 2
         for item in res:
-            assert item.gender == "M" and item.state == "OH"
+            assert item.gender == "M"
+            assert item.state == "OH"
 
         # Filter IS IN List values
         li = ["OH", "NY"]
@@ -95,7 +96,8 @@ def test_dataframe_filter(self, spark):
         df2 = df.filter(~df.state.isin(li))
         res = df2.collect()
         for item in res:
-            assert item.state != "OH" and item.state != "NY"
+            assert item.state != "OH"
+            assert item.state != "NY"
 
         df2 = df.filter(not df.state.isin(li))
         res2 = df2.collect()

tests/fast/spark/test_spark_functions_numeric.py

@@ -334,10 +334,12 @@ def test_random(self, spark):
         res = df.withColumn("rand", sf.rand()).collect()
 
         assert isinstance(res[0].rand, float)
-        assert res[0].rand >= 0 and res[0].rand < 1
+        assert res[0].rand >= 0
+        assert res[0].rand < 1
 
         assert isinstance(res[1].rand, float)
-        assert res[1].rand >= 0 and res[1].rand < 1
+        assert res[1].rand >= 0
+        assert res[1].rand < 1
 
     @pytest.mark.parametrize("sign_func", [sf.sign, sf.signum])
     def test_sign(self, spark, sign_func):

tests/fast/test_import_export.py

@@ -32,8 +32,10 @@ def import_database(import_location):
 def move_database(export_location, import_location):
     export_dir = Path(export_location)
     import_dir = Path(import_location)
-    assert export_dir.exists() and export_dir.is_dir()
-    assert import_dir.exists() and import_dir.is_dir()
+    assert export_dir.exists()
+    assert export_dir.is_dir()
+    assert import_dir.exists()
+    assert import_dir.is_dir()
 
     for file in ["schema.sql", "load.sql", "tbl.csv"]:
         shutil.move(export_dir / file, import_dir)