Merge pull request #193 from AI-SDC/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -66,7 +66,7 @@ repos:
 
   # Black format Python and notebooks
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
       - id: black-jupyter
 

acro/__init__.py

@@ -1,3 +1,4 @@
 """ACRO."""
+
 from .acro import *
 from .acro_regression import *

acro/acro_stata_parser.py

@@ -3,6 +3,7 @@
 Jim Smith 2023 @james.smith@uwe.ac.uk
 MIT licenses apply.
 """
+
 import pandas as pd
 import statsmodels.iolib.summary as sm_iolib_summary
 
@@ -118,9 +119,9 @@ def parse_table_details(varlist: list, varnames: list, options: str) -> dict:
         extras = superrows.split()
         for word in extras:
             if word not in varnames:
-                details[
-                    "errmsg"
-                ] = f"Error: word {word} in by-list is not a variables name"
+                details["errmsg"] = (
+                    f"Error: word {word} in by-list is not a variables name"
+                )
                 return details
             if word not in details["rowvars"]:
                 details["rowvars"].insert(0, word)

acro/acro_tables.py

@@ -1,4 +1,5 @@
 """ACRO: Tables functions."""
+
 # pylint: disable=too-many-lines
 from __future__ import annotations
 
@@ -1237,35 +1238,43 @@ def get_queries(masks, aggfunc) -> list[str]:
                     if isinstance(row_label, tuple):
                         index_query = " & ".join(
                             [
-                                f"({level} == {val})"
-                                if isinstance(val, (int, float))
-                                else f'({level} == "{val}")'
+                                (
+                                    f"({level} == {val})"
+                                    if isinstance(val, (int, float))
+                                    else f'({level} == "{val}")'
+                                )
                                 for level, val in zip(index_level_names, row_label)
                             ]
                         )
                     else:
                         index_query = " & ".join(
                             [
-                                f"({index_level_names} == {row_label})"
-                                if isinstance(row_label, (int, float))
-                                else (f"({index_level_names}" f'== "{row_label}")')
+                                (
+                                    f"({index_level_names} == {row_label})"
+                                    if isinstance(row_label, (int, float))
+                                    else (f"({index_level_names}" f'== "{row_label}")')
+                                )
                             ]
                         )
                     if isinstance(col_label, tuple):
                         column_query = " & ".join(
                             [
-                                f"({level} == {val})"
-                                if isinstance(val, (int, float))
-                                else f'({level} == "{val}")'
+                                (
+                                    f"({level} == {val})"
+                                    if isinstance(val, (int, float))
+                                    else f'({level} == "{val}")'
+                                )
                                 for level, val in zip(column_level_names, col_label)
                             ]
                         )
                     else:
                         column_query = " & ".join(
                             [
-                                f"({column_level_names} == {col_label})"
-                                if isinstance(col_label, (int, float))
-                                else (f"({column_level_names}" f'== "{col_label}")')
+                                (
+                                    f"({column_level_names} == {col_label})"
+                                    if isinstance(col_label, (int, float))
+                                    else (f"({column_level_names}" f'== "{col_label}")')
+                                )
                             ]
                         )
                     query = f"{index_query} & {column_query}"

acro/stata_config.py

@@ -4,6 +4,7 @@
 mutable hence use of lower case naming
 Jim Smith 2023.
 """
+
 import acro
 
 stata_acro = acro.ACRO()

acro/version.py

@@ -1,2 +1,3 @@
 """ACRO version number."""
+
 __version__ = "0.4.5"

notebooks/acro_demo_v2.ipynb

@@ -392,9 +392,9 @@
     "df[\"children\"] = pd.to_numeric(df[\"children\"])\n",
     "\n",
     "df[\"children\"] = df.apply(\n",
-    "    lambda row: row[\"children\"]\n",
-    "    if row[\"children\"] in (1, 2, 3)\n",
-    "    else np.random.randint(4, 10),\n",
+    "    lambda row: (\n",
+    "        row[\"children\"] if row[\"children\"] in (1, 2, 3) else np.random.randint(4, 10)\n",
+    "    ),\n",
     "    axis=1,\n",
     ")"
    ]

notebooks/test-nursery.ipynb

@@ -309,9 +309,9 @@
     "df[\"children\"] = pd.to_numeric(df[\"children\"])\n",
     "\n",
     "df[\"children\"] = df.apply(\n",
-    "    lambda row: row[\"children\"]\n",
-    "    if row[\"children\"] in (1, 2, 3)\n",
-    "    else np.random.randint(4, 10),\n",
+    "    lambda row: (\n",
+    "        row[\"children\"] if row[\"children\"] in (1, 2, 3) else np.random.randint(4, 10)\n",
+    "    ),\n",
     "    axis=1,\n",
     ")"
    ]

notebooks/test-nursery.py

@@ -61,9 +61,9 @@
 df["children"] = pd.to_numeric(df["children"])
 
 df["children"] = df.apply(
-    lambda row: row["children"]
-    if row["children"] in (1, 2, 3)
-    else np.random.randint(4, 10),
+    lambda row: (
+        row["children"] if row["children"] in (1, 2, 3) else np.random.randint(4, 10)
+    ),
     axis=1,
 )