Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
2b7c596
some reordering
Jul 11, 2025
bd136a1
create independent functions
Jul 16, 2025
9c595ef
wip non monotonic range join
Jul 16, 2025
14260db
wip fix region generation
Jul 16, 2025
bab7046
faster range join with cython
Jul 17, 2025
f5f743a
wip multiple non-equi join cython
Jul 17, 2025
e43422b
build positive matches
Jul 24, 2025
05f2806
update conditional_join to use cython for faster computation
Aug 4, 2025
b606443
update conditional_join to use cython for faster computation
Aug 4, 2025
601a353
exclude numpy.get_include
Aug 4, 2025
a57222f
exclude numpy.get_include
Aug 4, 2025
a54d4a8
wrap Extension object in a list
Aug 4, 2025
747e3a7
exclude cython_functions from pytest
Aug 4, 2025
26c40f1
pytest fix attempt 5
Aug 4, 2025
93a0d28
update setup.py
Aug 4, 2025
14f7347
--importmode=importlib
Aug 4, 2025
e7cd6af
--importmode=importlib
Aug 4, 2025
c72e861
resolve imports
Aug 4, 2025
90e80ee
fix directory location cython files
Aug 4, 2025
b87b92a
update test_docs_general_functions_present
Aug 4, 2025
79e263c
revert update
Aug 4, 2025
14882ed
test docs
Aug 4, 2025
6c0a5e0
hack
Aug 4, 2025
89e2f04
hack 2
Aug 4, 2025
77d5181
hack 3
Aug 4, 2025
e16d1b1
hack 4
Aug 4, 2025
240e0d3
hack 5
Aug 4, 2025
b20ed2f
hack 6
Aug 4, 2025
769053f
cleanup test_documentation_build
Aug 4, 2025
11e0b85
add use_pandas_merge_for_equi_join function
Aug 8, 2025
e200495
add comments
Aug 8, 2025
c662eec
hack to fix test_documentation_build.py
Aug 8, 2025
d044b77
hack 2
Aug 8, 2025
33fecc1
hack3
Aug 8, 2025
5237b5c
hack4
Aug 8, 2025
7a8a446
hack5
Aug 8, 2025
1c09793
hack6
Aug 8, 2025
5e1a12b
force c installation
Aug 9, 2025
8cf3009
allow cython if available
Aug 9, 2025
1d9a598
change order for tests.yml
Aug 9, 2025
a624749
is the c code installed?
Aug 9, 2025
02b8901
no need for setup.py build_ext
Aug 9, 2025
4152bf7
improve pytest?
Aug 9, 2025
bdcadda
skip unneeded files atm
Aug 9, 2025
dab7b04
use cython functions as much as possible
Aug 10, 2025
65c1cdc
extend cython optimisation to equi indices
Aug 10, 2025
eb486af
update cond_join.c
Aug 10, 2025
672324a
update tests for ragged arrays and indices
Aug 11, 2025
f1a78f9
fix numba for equi join
Aug 12, 2025
1c3e787
fix numba for equi join
Aug 12, 2025
5d16a63
update numba functions
Aug 19, 2025
026b009
update numba for single join
Aug 19, 2025
eec9195
cleanup
Aug 27, 2025
49db08c
update cond_join.c
Aug 27, 2025
c60ac42
updates
Aug 30, 2025
6b9bd35
improve cython with exceptval
Aug 30, 2025
c3bf6ec
cleanup
Aug 30, 2025
b54ccde
update helpers.py
Aug 30, 2025
f568b92
use cython where possible
Aug 30, 2025
6f014eb
avoid mutation warning for row_count
Aug 30, 2025
8578b9b
use c file only for now
Aug 30, 2025
1a09db2
keep binary_search_appropriate check simple for equi join
Aug 31, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
auto-update-conda: true
environment-file: environment-dev.yml
miniforge-version: latest
channels: conda-forge, defaults

- name: Install pyjanitor
# use editable mode to avoid _pytest.pathlib.ImportPathMismatchError
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
environment-file: environment-dev.yml
miniforge-version: latest


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

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,5 @@ tags
*.profraw
/scratch.py
midpoint.csv
examples/notebooks/conditional_join.ipynb
janitor/cython_functions/cond_join.html
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ repos:
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
args: ["--maxkb=2000"]
- repo: https://github.com/psf/black
rev: 25.1.0
hooks:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- [ENH] Added `row_count` parameter for janitor.conditional_join - Issue #1269 @samukweku
- [ENH] Reverse deprecation of `pivot_wider()` -- Issue #1464
- [ENH] Add accessor and method for pandas DataFrameGroupBy objects. - Issue #587 @samukweku
- [ENH] Optimise conditional_join with cython. - Issue #1490 @samukweku

## [v0.31.0] - 2025-03-07

Expand Down
3 changes: 2 additions & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ channels:
dependencies:
- python=3.10
- biopython
- black=22.12.0 # keep this in sync with `.pre-commit-config.yaml`
- black=25.1.0 # keep this in sync with `.pre-commit-config.yaml`
- bump2version=1.0.1
- cairo
- conda
- cython
- hypothesis
- ipykernel
- ipython
Expand Down
Empty file.
Loading
Loading