Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix running CLI with join column for target data #356

Merged
merged 3 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nannyml/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,6 @@
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)

Check warning on line 301 in nannyml/runner.py

View check run for this annotation

Codecov / codecov/patch

nannyml/runner.py#L301

Added line #L301 was not covered by tests
else:
return analysis_data.join(target_data)
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -62,7 +62,7 @@ python =
[testenv]
allowlist_externals = pytest
deps =
pytest
pytest==6.2.5
pytest-cov
pytest-mock
pytest-lazy-fixture
Expand Down
Loading