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

Add support pandas 2 in flytekit #1818

Merged
merged 63 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
6c15fda
remove pandas
pingsutw Sep 3, 2023
e4a5e55
update dev requirement
pingsutw Sep 16, 2023
1b49769
update dev requirement
pingsutw Sep 16, 2023
909fbce
update dev requirement
pingsutw Sep 16, 2023
f01e3b7
fix tests
pingsutw Sep 16, 2023
3962fe6
return dummy module if module is not installed
pingsutw Oct 10, 2023
015a0ac
Merge branch 'master' of github.com:flyteorg/flytekit into remove-pandas
pingsutw Oct 10, 2023
68c032c
nit
pingsutw Oct 10, 2023
30eee83
fixed tests
pingsutw Oct 10, 2023
0347700
nit
pingsutw Oct 10, 2023
8e0b58f
fixed tests
pingsutw Oct 10, 2023
4fb0c03
fixed tests
pingsutw Oct 10, 2023
4d30607
fixed tests
pingsutw Oct 10, 2023
e2b5450
fixed tests
pingsutw Oct 10, 2023
3e64dcb
nit
pingsutw Oct 10, 2023
bf968f3
Add tests
pingsutw Oct 10, 2023
ae53480
lint
pingsutw Oct 10, 2023
c2921d0
lint
pingsutw Oct 10, 2023
df88479
merged master
pingsutw Nov 6, 2023
6d5d9fb
merged master
pingsutw Nov 16, 2023
d3b8e5f
add pyarrow to dev
pingsutw Nov 16, 2023
2e88e74
merged master
pingsutw Nov 17, 2023
4edec78
merged master
pingsutw Nov 21, 2023
5f477c7
nit
pingsutw Nov 21, 2023
fdaa5f6
rename
pingsutw Nov 21, 2023
f6ab978
Test pandas 1 & 2
pingsutw Nov 25, 2023
10b00c3
Merged master
pingsutw Nov 25, 2023
e68da19
update GA workflow
pingsutw Nov 25, 2023
c57c0fe
update GA workflow
pingsutw Nov 25, 2023
94c9aca
unit test without pandas
pingsutw Nov 25, 2023
10d8466
fix tests
pingsutw Nov 25, 2023
e15910d
lint
pingsutw Nov 25, 2023
d5669da
fix tests
pingsutw Nov 25, 2023
85a431b
Add pyarrow back
pingsutw Nov 25, 2023
97bd5e9
Skip some tests
pingsutw Nov 26, 2023
242436d
Skip some tests
pingsutw Nov 26, 2023
bb7ab63
Fix tests
pingsutw Nov 26, 2023
22ba6c0
fix tests
pingsutw Nov 26, 2023
dc6119f
nit
pingsutw Nov 26, 2023
1dcba35
lint
pingsutw Nov 26, 2023
0e8ea2c
Fix tests
pingsutw Nov 26, 2023
b29ec36
Fix tests
pingsutw Nov 26, 2023
e6c3a0d
Skip specific test
pingsutw Nov 27, 2023
8a2d047
nit
pingsutw Nov 27, 2023
b311082
update-pytest-mark
pingsutw Nov 27, 2023
37af712
fix-test
pingsutw Nov 27, 2023
68fcc8f
lint
pingsutw Nov 27, 2023
b47f436
Fix tests
pingsutw Nov 28, 2023
788f918
fix-test
pingsutw Nov 28, 2023
18c4fb8
lint
pingsutw Nov 28, 2023
97b8547
fix-test
pingsutw Nov 28, 2023
1185631
uninstall -y
pingsutw Nov 28, 2023
351d673
fixed test
pingsutw Dec 15, 2023
d05a11f
Merged master
pingsutw Dec 15, 2023
30a986a
ni
pingsutw Dec 15, 2023
55c8847
update test_union_in_dataclass
pingsutw Dec 15, 2023
1da781d
lint
pingsutw Dec 15, 2023
cae2746
Merge branch 'master' of github.com:flyteorg/flytekit into remove-pandas
pingsutw Dec 15, 2023
a155a0e
Update github workflow
pingsutw Dec 15, 2023
915818f
nit
pingsutw Dec 15, 2023
cef8fae
force reinstall
pingsutw Dec 15, 2023
9a8278b
nit
pingsutw Dec 15, 2023
52a1143
nit
pingsutw Dec 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion dev-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ torch<=1.12.1; python_version<'3.11'
# pytorch 2 supports python 3.11
torch<=2.0.0; python_version>='3.11' or platform_system!='Windows'

scikit-learn
types-protobuf
types-croniter
types-mock
autoflake

pandas
pyarrow
numpy
scikit-learn
prometheus-client
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"googleapis-common-protos>=1.57",
"flyteidl>=1.5.16",
"wheel>=0.30.0,<1.0.0",
"pandas>=1.0.0,<2.0.0",
"pyarrow>=4.0.0,<11.0.0",
"click>=6.6,<9.0",
"croniter>=0.3.20,<4.0.0",
"deprecated>=1.0,<2.0",
Expand Down Expand Up @@ -71,7 +69,6 @@
"diskcache>=5.2.1",
"cloudpickle>=2.0.0",
"cookiecutter>=1.7.3",
"numpy",
"gitpython",
"kubernetes>=12.0.1",
"rich",
Expand Down
2 changes: 1 addition & 1 deletion tests/flytekit/unit/core/test_type_hints.py
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@

@task
def t2(df: pandas.DataFrame) -> pandas.DataFrame:
return df.append(pandas.DataFrame(data={"col1": [5, 10], "col2": [5, 10]}))
return pd.concat([df, pandas.DataFrame(data={"col1": [5, 10], "col2": [5, 10]})])

Check warning on line 861 in tests/flytekit/unit/core/test_type_hints.py

View check run for this annotation

Codecov / codecov/patch

tests/flytekit/unit/core/test_type_hints.py#L861

Added line #L861 was not covered by tests

@workflow
def my_wf(a: int) -> pandas.DataFrame:
Expand Down