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.

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

Fixes for Pandas 2 support #742

Merged
merged 49 commits into from
Feb 4, 2025
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a37e797
Fix test setup to match pandas 2.0 demands
bartbroere Dec 15, 2024
e3dd93a
Use the now deprecated _append method
bartbroere Dec 15, 2024
2ae1296
Deal with numeric_only being removed in metrics test
bartbroere Dec 15, 2024
c847c6d
Skip mad metric for other pandas versions
bartbroere Dec 16, 2024
141682a
Account for differences between pandas versions in describe methods
bartbroere Dec 16, 2024
718b249
Run black
bartbroere Dec 16, 2024
bd0b10d
Check Pandas version first
bartbroere Dec 16, 2024
b6a31bd
Mirror behaviour of installed Pandas version when running value_counts
bartbroere Dec 18, 2024
399200d
Allow passing arguments to the individual asserters
bartbroere Dec 18, 2024
c198cc9
Fix for method _construct_axes_from_arguments no longer existing
bartbroere Dec 18, 2024
b18036d
Skip mad metric if it does not exist
bartbroere Dec 18, 2024
470848c
Account for pandas 2.0 timestamp default behaviour
bartbroere Dec 18, 2024
19ad96d
Deal with empty vs other inferred data types
bartbroere Dec 18, 2024
0ad66a0
Account for default datetime precision change
bartbroere Dec 18, 2024
388722c
Run Black
bartbroere Dec 18, 2024
416ec1e
Solution for differences in inferred_type only
bartbroere Dec 18, 2024
73078d3
Fix csv and json issues
bartbroere Dec 19, 2024
83df6dd
Skip two doctests
bartbroere Dec 19, 2024
81b381c
Passing a set as indexer is no longer allowed
bartbroere Dec 19, 2024
1146b2e
Don't validate output where it differs between Pandas versions in the…
bartbroere Dec 19, 2024
02f1573
Update test matrix and packaging metadata
bartbroere Dec 19, 2024
d08a29a
Update version of Python in the docs
bartbroere Dec 19, 2024
d70e2b9
Update Python version in demo notebook
bartbroere Dec 19, 2024
b8b1526
Match noxfile
bartbroere Dec 19, 2024
cfcd7a8
Symmetry
bartbroere Jan 6, 2025
96a5069
Fix trailing comma in JSON
bartbroere Jan 6, 2025
e269fa0
Merge branch 'main' into prepare-for-pandas-2
bartbroere Jan 8, 2025
ea98797
Revert some changes in setup.py to fix building the documentation
bartbroere Jan 10, 2025
7be5a9e
Merge branch 'main' into prepare-for-pandas-2
bartbroere Jan 18, 2025
d91b5c3
Revert "Revert some changes in setup.py to fix building the documenta…
bartbroere Jan 18, 2025
59e06f6
Merge branch 'main' into prepare-for-pandas-2
pquentin Jan 22, 2025
f9c589b
Use PANDAS_VERSION from eland.common
bartbroere Jan 28, 2025
d6f7af2
Still skip the doctest, but make the output pandas 2 instead of 1
bartbroere Jan 29, 2025
b188219
Still skip doctest, but switch to pandas 2 output
bartbroere Jan 29, 2025
12753d5
Prepare for pandas 3
bartbroere Jan 29, 2025
00c3c7c
Reference the right column
bartbroere Jan 29, 2025
f3c7e2e
Ignore output in tests but switch to pandas 2 output
bartbroere Jan 29, 2025
f13f83a
Add line comment about NBVAL_IGNORE_OUTPUT
bartbroere Jan 29, 2025
ddc1c26
Restore missing line and add stderr cell
bartbroere Jan 30, 2025
f335e6a
Use non-private method instead
bartbroere Jan 30, 2025
948b731
Fix indentation and parameter issues
bartbroere Jan 30, 2025
d7ad7ed
If index is not specified, and pandas 1 is present, set it to True
bartbroere Jan 30, 2025
2a1a6d4
Run black
bartbroere Jan 30, 2025
a37d266
Newer version of black might have different opinions?
bartbroere Jan 30, 2025
2942e5e
Add line comment
bartbroere Jan 30, 2025
270bd48
Remove unused import
bartbroere Feb 4, 2025
1ac1653
Add reason for ignore statement
bartbroere Feb 4, 2025
6a9b302
Add reason for skip
bartbroere Feb 4, 2025
f8e9701
Merge branch 'main' into prepare-for-pandas-2
pquentin Feb 4, 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
Prev Previous commit
Next Next commit
Reference the right column
  • Loading branch information
bartbroere authored Jan 29, 2025
commit 00c3c7c1bad47049216d85938a3205127ec91dbb
3 changes: 1 addition & 2 deletions eland/etl.py
Original file line number Diff line number Diff line change
Expand Up @@ -535,10 +535,9 @@ def csv_to_eland( # type: ignore
if "mangle_dupe_cols" in kwargs:
kwargs.pop("mangle_dupe_cols")
warnings.warn(
"This argument no longer works. Furthermore, "
"The mangle_dupe_cols argument no longer works. Furthermore, "
"duplicate columns will automatically get a number suffix."
)

# read csv in chunks to pandas DataFrame and dump to eland DataFrame (and Elasticsearch)
reader = pd.read_csv(filepath_or_buffer, **kwargs)

Expand Down