From 069bc80fa7c55d71efee681955db047c3ffe2d14 Mon Sep 17 00:00:00 2001 From: Michael Van de Steene Date: Mon, 29 Jan 2024 22:44:09 +0100 Subject: [PATCH 1/3] Fix running CLI with join column for target data --- nannyml/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nannyml/runner.py b/nannyml/runner.py index 38e395de..dcba9cc8 100644 --- a/nannyml/runner.py +++ b/nannyml/runner.py @@ -298,6 +298,6 @@ def _add_targets_to_analysis_data( analysis_data: pd.DataFrame, target_data: pd.DataFrame, join_column: Optional[str] ) -> pd.DataFrame: if join_column is not None: - return analysis_data.merge(target_data, on=target_data.join_column) + return analysis_data.merge(target_data, on=join_column) else: return analysis_data.join(target_data) From a765a492b2bbb7c87cc1021d4436f511811abe6d Mon Sep 17 00:00:00 2001 From: Michael Van de Steene Date: Mon, 29 Jan 2024 23:18:13 +0100 Subject: [PATCH 2/3] Pin pytest version to fix tox tests --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index af714661..fac89535 100644 --- a/setup.cfg +++ b/setup.cfg @@ -62,7 +62,7 @@ python = [testenv] allowlist_externals = pytest deps = - pytest + pytest==6.2.5 pytest-cov pytest-mock pytest-lazy-fixture From 9c661c44e2ec2115db9c45a5c3632bdc3d818f74 Mon Sep 17 00:00:00 2001 From: Niels Nuyttens Date: Fri, 2 Feb 2024 16:12:25 +0100 Subject: [PATCH 3/3] Ignore E704 errors raised by flake8 all of a sudden... --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fac89535..1f1c9658 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [flake8] max-line-length = 120 max-complexity = 18 -ignore = E203, E266, W503 +ignore = E203, E266, E704, W503 docstring-convention = google per-file-ignores = __init__.py:F401 exclude = .git,