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.

Sign up for GitHub

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

[ENH] maintain sorted array for conditional join #1398

Merged
merged 30 commits into from
Oct 2, 2024
Merged

[ENH] maintain sorted array for conditional join #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
03d15d9
more control on how the final dataframe is created
Sep 6, 2024
c5a59d6
fix doctests
Sep 7, 2024
f138af0
fix doctest for polars.pivot_longer
Sep 7, 2024
72f6e1a
fix bird_call.ipynb ruff
Sep 7, 2024
8b64a74
fix board_games.ipynb ruff
Sep 7, 2024
7a6e39b
fix complete.ipynb ruff
Sep 7, 2024
114bb37
fix french_trains.ipynb ruff
Sep 7, 2024
7148186
fix medium_franchise.ipynb ruff
Sep 7, 2024
8c4384d
fix teacher_pupil.ipynb
Sep 7, 2024
de3f958
fix scipy2019 slides ruff
Sep 7, 2024
8740209
add support for ragged arrays
Sep 7, 2024
de7958e
fix test failure
Sep 7, 2024
0f3a441
make equi join align with non-equi join numba
Sep 7, 2024
4fea89d
cleanup tests
Sep 7, 2024
814021a
fail early if df or right is empty
Sep 7, 2024
239ee29
fix doctest
Sep 7, 2024
1cbb37f
remove irrelevant comments
Sep 7, 2024
e76f38a
improve perf for equal indices
Sep 8, 2024
d3c5772
add TODO for equi joins
Sep 8, 2024
1fbd928
keep faster equi-join
Sep 8, 2024
f83546d
merge dev
Sep 17, 2024
57317b0
abstract sorted_array operation to separate function
Sep 17, 2024
bfea362
Merge branch 'dev' into samukweku/non-equi-join-improve
samukweku Sep 17, 2024
cc66145
minor refactor
Sep 18, 2024
0eaef6d
Merge dev into samukweku/non-equi-join-improve
ericmjl Sep 23, 2024
ce68d4e
Merge dev into samukweku/non-equi-join-improve
ericmjl Sep 23, 2024
3510269
Merge dev into samukweku/non-equi-join-improve
ericmjl Sep 28, 2024
a94f13b
Merge dev into samukweku/non-equi-join-improve
ericmjl Oct 1, 2024
3495271
switch to miniforge
Oct 1, 2024
c79e330
update miniconda setup
Oct 1, 2024
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
5 changes: 2 additions & 3 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ jobs:

# See: https://github.com/marketplace/actions/setup-miniconda
- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
miniforge-variant: Mambaforge
environment-file: environment-dev.yml
use-mamba: true
miniforge-version: latest

- name: Install pyjanitor
# use editable mode to avoid _pytest.pathlib.ImportPathMismatchError
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ jobs:

# See: https://github.com/marketplace/actions/setup-miniconda
- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
miniforge-variant: Mambaforge
channels: conda-forge
environment-file: environment-dev.yml
use-mamba: true
miniforge-version: latest

- name: Install pyjanitor
run: python -m pip install -e .
Expand Down
Loading
Loading