Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
144ff14
Add Windows support to environments in pixi config
samukweku Dec 28, 2025
5e2c2a2
Refactor multiple condition not-equal join logic
samukweku Dec 28, 2025
d54d7e4
wip
samukweku Dec 28, 2025
42b17a7
wip
samukweku Dec 29, 2025
1731086
Refactor and optimize conditional join logic
samukweku Jan 6, 2026
0abf92c
Reduce max_examples in hypothesis tests to 10
samukweku Jan 7, 2026
2fa1cec
Update janitor_rs wheel URLs in lock file
samukweku Jan 7, 2026
15bfa7d
Refactor conditional_join imports and deprecate numba usage
samukweku Jan 7, 2026
a59d3b2
Merge remote-tracking branch 'origin/dev' into sammywemmy-equi-join-u…
samukweku Jan 7, 2026
c2edfef
Remove deprecation warnings for df_columns and right_columns
samukweku Jan 7, 2026
1dc7dcf
Deprecate numba support and fix select_columns usage
samukweku Jan 7, 2026
2d95a4b
Add join_agg aggregation to conditional_join
samukweku Jan 9, 2026
4734ed6
Update pyproject.toml
ericmjl Jan 10, 2026
13dc740
Add aggregation functions for conditional join
samukweku Jan 12, 2026
81bdd23
Refactor conditional join: remove debug prints, improve docs, and ref…
samukweku Jan 12, 2026
552e668
Update janitor/functions/_conditional_join/_get_indices_equi.py
samukweku Jan 12, 2026
6ae9156
Update janitor/functions/_conditional_join/_get_indices_equi.py
samukweku Jan 12, 2026
4c74551
Update doc references to select_columns syntax
samukweku Jan 12, 2026
e482716
Update DataFrame creation in conditional_join.py
samukweku Jan 12, 2026
f85d207
Update DataFrame to include 'id' column
samukweku Jan 12, 2026
1461321
Add 'id' column to df2 in conditional_join.py
samukweku Jan 12, 2026
d5db10d
Delete janitor/functions/Untitled.ipynb
samukweku Jan 12, 2026
b1d9642
Refactor docstring in conditional_join.py
samukweku Jan 12, 2026
08d0a28
Change return type from dict to pd.DataFrame
samukweku Jan 12, 2026
7a9bf78
Change return type to DataFrame in conditional_join
samukweku Jan 12, 2026
d5ae5ba
Enhance docstring for conditional_join function
samukweku Jan 12, 2026
9387c31
Refactor conditional_join to accept conditions as tuples
samukweku Jan 12, 2026
4ca2838
Remove commented-out return statement
samukweku Jan 12, 2026
8e6a6bb
Allow 'prod' aggregation in conditional_join
samukweku Jan 12, 2026
4ea2ef6
updates
samukweku Jan 12, 2026
6addf4a
fixes
samukweku Jan 12, 2026
2206372
updates based on copilot feedback
samukweku Jan 12, 2026
935ec16
remove unused variables
samukweku Jan 12, 2026
ff4e5a2
update example
samukweku Jan 12, 2026
db40b31
Merge branch 'sammywemmy-equi-join-upgrade' of https://github.com/pyj…
samukweku Jan 12, 2026
bec4534
Update pixi.lock
samukweku Jan 12, 2026
94aea73
add include_join_positions parameter
samukweku Jan 13, 2026
76c82b1
update internal code
samukweku Jan 13, 2026
4de36b2
wip functions for reverse aggregation
samukweku Jan 18, 2026
4953e7d
wip
Jan 22, 2026
562b93e
wip
Jan 23, 2026
20057d5
add reverse functions for agg
Jan 23, 2026
3ee7785
update code
Jan 24, 2026
4604ba4
wip
Jan 26, 2026
10199af
internal refactors
Jan 29, 2026
e05a52a
updates
Jan 29, 2026
02f7059
updates
Jan 29, 2026
ff91e35
updates
Jan 29, 2026
a787997
add join_algorithm parameter to join_agg and get_join_indices
Jan 29, 2026
2fb0cce
add join_algorithm parameter to join_agg and get_join_indices
Jan 29, 2026
5f138a5
update docs
Jan 29, 2026
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 CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog

## [Unreleased]

- [ENH] Add `include_join_positions` parameter to `conditional_join`; added limited support for join aggregations via the `join_agg` function. - Issue #1497 @samukweku
- [ENH] Added `rle_id` function for run-length encoding IDs - Issue #1435 @emmanuel-ferdman

## [v0.32.3] - 2025-12-11
Expand Down
3 changes: 2 additions & 1 deletion janitor/functions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
from .collapse_levels import collapse_levels
from .complete import complete
from .concatenate_columns import concatenate_columns
from .conditional_join import conditional_join, get_join_indices
from .conditional_join import conditional_join, get_join_indices, join_agg
from .convert_date import (
convert_excel_date,
convert_matlab_date,
Expand Down Expand Up @@ -156,6 +156,7 @@
"impute",
"jitter",
"join_apply",
"join_agg",
"label_encode",
"limit_column_characters",
"min_max_scale",
Expand Down
Loading