Skip to content
Closed
Changes from 2 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
29039f9
Added requirements.txt with project dependencies
pelagiavlas Mar 26, 2025
65de448
ValueError in pytest parametrization due to direct Index object evalu…
pelagiavlas Apr 7, 2025
0816a26
BUG: Fix TypeError in set operations with mixed int/string indexes
pelagiavlas Apr 7, 2025
b87036f
BUG: Handle mixed int/str types in Index.union
pelagiavlas Apr 7, 2025
946f99b
BUG: Fix value_counts() with mixed int/str indexes containing nulls
pelagiavlas Apr 7, 2025
a671eb7
Merge branch 'main' of https://github.com/pandas-dev/pandas
xaris96 Apr 9, 2025
416a6ae
Merge branch 'main' of https://github.com/pandas-dev/pandas
xaris96 Apr 9, 2025
2e63667
BUG: Ignore mixed-type comparison warning in tests
pelagiavlas Apr 10, 2025
5550b1d
BUG: Apply xfail to handle unsupported int/str comparison in test_sor…
pelagiavlas Apr 10, 2025
33e2a34
BUG: Apply xfail to handle unsupported int/str comparison in test_sor…
pelagiavlas Apr 10, 2025
d7b534e
BUG: Mark test_numpy_ufuncs_reductions as xfail for mixed int/str index
pelagiavlas Apr 10, 2025
642734e
BUG: Avoid mixed-type Index in argsort test to prevent sorting errors
pelagiavlas Apr 14, 2025
dea15de
BUG: Skip argsort tests for mixed-type Index to avoid TypeError
pelagiavlas Apr 14, 2025
03c3b0a
TST: Add skip for tests using mixed-type Index
pelagiavlas Apr 14, 2025
5d1c154
one new test just for the mixed string in indices_dict (pandas\confet…
xaris96 Apr 21, 2025
c10c263
log files
xaris96 Apr 23, 2025
edb84e4
fixed test_union_duplicates[mixed-int-string] test fail in tests\inde…
xaris96 Apr 23, 2025
af140a8
2 test passed for mixed int string
xaris96 Apr 23, 2025
8992100
test_union_same_type mixed int string
xaris96 Apr 24, 2025
1fe92f9
test_union_different_types mixed int string fixed
xaris96 Apr 24, 2025
599df6d
test_union_base mixed int string test fail fixed
xaris96 Apr 24, 2025
3256953
total 5 tests fixed and 2 made xfailed
xaris96 Apr 24, 2025
bf05b29
Merge branch 'issue-TM' into vol2
xaris96 Apr 24, 2025
c856799
all tests passed!
xaris96 Apr 24, 2025
ed90c56
merged
xaris96 Apr 24, 2025
e3f1eb2
changes
xaris96 Apr 24, 2025
965edf8
Merge branch 'main' into issue-TM
pelagiavlas Apr 29, 2025
c42ac08
Fix pytest.xfail usage in test_sort_values_with_missing
pelagiavlas Apr 29, 2025
08f06b9
Fix pytest.xfail usage in test_sort_values_invalid_na_position
pelagiavlas Apr 29, 2025
1913ff8
Merge branch 'issue-TM' of https://github.com/xaris96/pandas into iss…
pelagiavlas Apr 29, 2025
8856592
Fix line length issue in test_numpy_compat.py
pelagiavlas Apr 29, 2025
e833869
Fix line length issue in test_numpy_compat.py
pelagiavlas Apr 29, 2025
5be6ef4
change comment
pelagiavlas Apr 29, 2025
7afd0d0
Fix line length issue in test_setops.py
pelagiavlas Apr 29, 2025
77d3069
Fix line length issue in test_setops.py
pelagiavlas Apr 29, 2025
218071c
Fix line length issue in test_algos.py
pelagiavlas Apr 29, 2025
62c3319
Fix long line issue and refactor xfail usage in test_sort_values_inva…
pelagiavlas Apr 29, 2025
b68dc54
Fix line length issue in tests
pelagiavlas Apr 29, 2025
cd0afea
Apply pre-commit fixes (e.g. ruff, isort, whitespace)
pelagiavlas Apr 29, 2025
a784a90
log files deleted
xaris96 May 5, 2025
39bbffa
Merge branch 'issue-TM' of https://github.com/xaris96/pandas into iss…
pelagiavlas May 5, 2025
eb2f210
Fix trailing whitespace in test_mixed_int_string.py
xaris96 May 7, 2025
710e4d5
changes for pre-commit.ci
xaris96 May 7, 2025
079aeb1
pre-commit run --all-files changes
xaris96 May 7, 2025
545f04c
lines too long
xaris96 May 7, 2025
a16f5b3
mark x fail and some tests fixed
xaris96 May 8, 2025
413dad1
new
xaris96 May 8, 2025
a6b958b
pd fixed
xaris96 May 8, 2025
0c0ef09
test passed
xaris96 May 8, 2025
d3a2378
mark.xfail instead of skip in test_setops
xaris96 May 8, 2025
355a058
test_misc
xaris96 May 10, 2025
a2d5fbf
done
xaris96 May 10, 2025
ec189e4
better approach for mixed int, 1 more test passed
xaris96 May 10, 2025
771c098
mark x fail
xaris96 May 10, 2025
25ba609
Merge branch 'main' into issue-TM
xaris96 May 10, 2025
acd31b1
Trigger CI rerun
xaris96 May 11, 2025
b522022
test rolling change
xaris96 May 11, 2025
64bf3fe
test rolling
xaris96 May 11, 2025
4c4e673
new change
xaris96 May 11, 2025
96c26a3
pre commit checks done
xaris96 May 11, 2025
dfc6a4a
return some commits back
xaris96 May 12, 2025
01a93c8
back
xaris96 May 12, 2025
c5215e2
..
xaris96 May 12, 2025
31e4730
adjust tolerance
xaris96 May 12, 2025
b9b6ba4
xfail on 32bit platform
xaris96 May 12, 2025
d661599
pre commit check. platform check added
xaris96 May 13, 2025
ec5a628
unit test changes fora pyodide build test
xaris96 May 14, 2025
f959d03
unit test undo changes and changes in test rolling
xaris96 May 14, 2025
88e1b81
Merge branch 'main' into issue-TM
xaris96 May 14, 2025
7b12c91
skip instead of fail
xaris96 May 14, 2025
6a764d7
Remove files that were incorrectly brought back: coiled.svg and cibw_…
xaris96 May 15, 2025
03b5a69
Merge branch 'main' into issue-TM
xaris96 May 15, 2025
2856da0
Merge branch 'main' into issue-TM
xaris96 May 18, 2025
ae6dd39
Added an entry in the latest doc/source/whatsnew/v3.0.0.rst
xaris96 May 20, 2025
ed182bf
Merge branch 'main' into issue-TM
xaris96 May 20, 2025
3a0c587
pull the changes
pelagiavlas May 20, 2025
8295e19
transfer the changes from the branch issue-shareMemory to this
pelagiavlas May 20, 2025
fa13416
Work in progress before switching branch
pelagiavlas May 20, 2025
e9025c3
Work in progress before switch branch
pelagiavlas May 20, 2025
2a5e7be
changes for branch to pass the tests
pelagiavlas May 20, 2025
c0ca9ae
changes for branch to pass the tests
pelagiavlas May 20, 2025
639326c
changes for branch to pass the test_common.py
pelagiavlas May 21, 2025
dceb014
Resolve conflicts after branch change
pelagiavlas May 21, 2025
5e49988
Merge branch 'issue-index' of https://github.com/xaris96/pandas into …
pelagiavlas May 21, 2025
4f9b22f
Merge branch 'main' into issue-index
pelagiavlas May 21, 2025
c2a27b4
pre commit check
xaris96 May 21, 2025
3cfdbcd
DOC: Add whatsnew entry for setitem with NA in indexer
pelagiavlas May 21, 2025
b1e014e
Merge branch 'issue-index' of https://github.com/xaris96/pandas into …
pelagiavlas May 21, 2025
99fd1b5
delete venv because create problems
pelagiavlas May 21, 2025
fa32798
done
xaris96 May 21, 2025
2732d60
change the doc/source/whatsnew/v3.0.0.rst
pelagiavlas May 21, 2025
0db0b0b
change the doc/source/whatsnew/v3.0.0.rst
pelagiavlas May 21, 2025
07c7e67
Merge branch 'main' into issue-index
xaris96 May 21, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.