Skip to content

Commit c21a572

Browse files
samukwekusamuel.oranyeliericmjl
authored
[ENH] maintain sorted array for conditional join (#1398)
* more control on how the final dataframe is created * fix doctests * fix doctest for polars.pivot_longer * fix bird_call.ipynb ruff * fix board_games.ipynb ruff * fix complete.ipynb ruff * fix french_trains.ipynb ruff * fix medium_franchise.ipynb ruff * fix teacher_pupil.ipynb * fix scipy2019 slides ruff * add support for ragged arrays * fix test failure * make equi join align with non-equi join numba * cleanup tests * fail early if df or right is empty * fix doctest * remove irrelevant comments * improve perf for equal indices * add TODO for equi joins * keep faster equi-join * abstract sorted_array operation to separate function * minor refactor * switch to miniforge * update miniconda setup --------- Co-authored-by: samuel.oranyeli <[email protected]> Co-authored-by: Eric Ma <[email protected]>
1 parent dfae45f commit c21a572

File tree

4 files changed

+1619
-1032
lines changed

4 files changed

+1619
-1032
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ jobs:
2323

2424
# See: https://github.com/marketplace/actions/setup-miniconda
2525
- name: Setup miniconda
26-
uses: conda-incubator/setup-miniconda@v2
26+
uses: conda-incubator/setup-miniconda@v3
2727
with:
2828
auto-update-conda: true
29-
miniforge-variant: Mambaforge
3029
environment-file: environment-dev.yml
31-
use-mamba: true
30+
miniforge-version: latest
3231

3332
- name: Install pyjanitor
3433
# use editable mode to avoid _pytest.pathlib.ImportPathMismatchError

.github/workflows/tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ jobs:
4141

4242
# See: https://github.com/marketplace/actions/setup-miniconda
4343
- name: Setup miniconda
44-
uses: conda-incubator/setup-miniconda@v2
44+
uses: conda-incubator/setup-miniconda@v3
4545
with:
4646
auto-update-conda: true
47-
miniforge-variant: Mambaforge
48-
channels: conda-forge
4947
environment-file: environment-dev.yml
50-
use-mamba: true
48+
miniforge-version: latest
5149

5250
- name: Install pyjanitor
5351
run: python -m pip install -e .

0 commit comments

Comments
 (0)