-
Notifications
You must be signed in to change notification settings - Fork 110
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
[DO NOT MERGE] [SNOW-1491199] merge phase0 server side #2136
base: main
Are you sure you want to change the base?
Changes from 107 commits
7a92099
e13fa28
ae3469d
4305cf2
e6ce3bb
7fbbc51
0cc4fa8
2a9b50b
2e54569
1446f51
7657d40
3c144f8
6537943
29684a4
b086fd2
8de5d28
7275dfa
f16f1cb
037fc60
e4a10f9
d30822a
bce97c0
e20a430
922881b
385ac60
ce81f68
9eef249
8d29d02
718fed4
c92e511
58eaa3c
4cecfdc
f513ea9
424bab1
6834c36
f7f969d
5ce96c1
ee82ca7
3653254
3a7e00d
6584e77
19f26d6
9708e0f
d2b8422
ebe4503
c601b2e
a34213f
661c8fb
253b311
4b15249
361c658
1a29aa6
adf7a2f
2ffcc07
9df970b
0739f91
ab76d2d
fe5dc09
3ec266e
80aeb2f
e117dae
2fb94a2
b75457e
d6ea21b
41842c6
0246634
8acb59e
70346e3
7fe4155
dc7b20d
9c346b7
b40a187
c009c30
fc9f6fe
db32933
01cdf37
f5ccaa9
e621a73
c3a2631
be272ff
ceebfae
5659feb
364459c
cef4e93
343538e
8927442
4b3cb8f
c7271ab
3d100a9
1ceee26
2b56702
5fc0950
0a2bbd4
d0249f3
f01c914
1238d9f
3d3e719
4197fb3
09bc49f
a498de1
567f179
0d45704
c1ade06
cdf4ae3
633ed2e
9b2b77e
f614829
7993692
61f12b3
5462de5
800a615
09a995e
eff22b1
08797a5
a557095
e843c05
15cabe0
c99f08c
3f07e4b
8bc690f
14c154d
ffabb53
c12e8cf
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,13 +13,18 @@ | |
MODIN_DEPENDENCY_VERSION = ( | ||
"==0.28.1" # Snowpark pandas requires modin 0.28.1, which depends on pandas 2.2.1 | ||
) | ||
CONNECTOR_DEPENDENCY_VERSION = ">=3.10.0, <4.0.0" | ||
# Use HEAD of main branch in connector. This doesn't work with [pandas] extra. | ||
# CONNECTOR_DEPENDENCY = "snowflake-connector-python @ git+https://github.com/snowflakedb/snowflake-connector-python@main#egg=snowflake-connector-python" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove comment |
||
CONNECTOR_DEPENDENCY_VERSION = ">=3.12.0, <4.0.0" | ||
CONNECTOR_DEPENDENCY = f"snowflake-connector-python{CONNECTOR_DEPENDENCY_VERSION}" | ||
INSTALL_REQ_LIST = [ | ||
"setuptools>=40.6.0", | ||
"wheel", | ||
f"snowflake-connector-python{CONNECTOR_DEPENDENCY_VERSION}", | ||
CONNECTOR_DEPENDENCY, | ||
# snowpark directly depends on typing-extension, so we should not remove it even if connector also depends on it. | ||
"typing-extensions>=4.1.0, <5.0.0", | ||
"protobuf", | ||
"tzlocal", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs legal review. For Phase 0, we better add them as optional dependency, or development dependency. |
||
"pyyaml", | ||
"cloudpickle>=1.6.0,<=2.2.1,!=2.1.0,!=2.2.0;python_version<'3.11'", | ||
"cloudpickle==2.2.1;python_version~='3.11'", # backend only supports cloudpickle 2.2.1 + python 3.11 at the moment | ||
|
@@ -31,6 +36,8 @@ | |
|
||
PANDAS_REQUIREMENTS = [ | ||
f"snowflake-connector-python[pandas]{CONNECTOR_DEPENDENCY_VERSION}", | ||
# When using HEAD of connector. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lets remove the comments in this file |
||
# f"{CONNECTOR_DEPENDENCY}[pandas]", | ||
] | ||
MODIN_REQUIREMENTS = [ | ||
*PANDAS_REQUIREMENTS, | ||
|
@@ -39,6 +46,7 @@ | |
DEVELOPMENT_REQUIREMENTS = [ | ||
"pytest<8.0.0", # check SNOW-1022240 for more details on the pin here | ||
"pytest-cov", | ||
"wrapt", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is this for? |
||
"coverage", | ||
"sphinx==5.0.2", | ||
"cachetools", # used in UDF doctest | ||
|
@@ -47,6 +55,12 @@ | |
"openpyxl", # used in read_excel test, not a requirement for distribution | ||
"matplotlib", # used in plot tests | ||
"pre-commit", | ||
"protoc-wheel-0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is this for? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we group them into |
||
"aiohttp", # vcrpy requirements. | ||
"boto", # vcrpy requirements. | ||
"httplib2", # vcrpy requirements. | ||
"httpx", # vcrpy requirements. | ||
"tornado", # vcrpy requirements. | ||
Comment on lines
+59
to
+63
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How is IR related to vcrpy? |
||
] | ||
|
||
# read the version | ||
|
@@ -88,6 +102,7 @@ | |
"snowflake.snowpark._internal", | ||
"snowflake.snowpark._internal.analyzer", | ||
"snowflake.snowpark._internal.compiler", | ||
"snowflake.snowpark._internal.proto", | ||
"snowflake.snowpark.mock", | ||
"snowflake.snowpark.modin", | ||
"snowflake.snowpark.modin.config", | ||
|
@@ -115,6 +130,8 @@ | |
"modin": MODIN_REQUIREMENTS, | ||
"secure-local-storage": [ | ||
f"snowflake-connector-python[secure-local-storage]{CONNECTOR_DEPENDENCY_VERSION}", | ||
# When using HEAD, use this. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove comment |
||
# f"{CONNECTOR_DEPENDENCY}[secure-local-storage]", | ||
], | ||
"development": DEVELOPMENT_REQUIREMENTS, | ||
"modin-development": [ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this change is required in this PR.