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.

Sign up for GitHub

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

Jump to bottom

fix: upgrade Ray to 2.6 #2402

Closed
wants to merge 3 commits into from
Closed

fix: upgrade Ray to 2.6 #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d94fb73
deps: upgrade ray to 2.6
jaidisido Jul 21, 2023
07270a2
add resolved poetry.lock
jaidisido Jul 21, 2023
084b02a
fix some mypy
jaidisido Jul 21, 2023
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
2 changes: 1 addition & 1 deletion awswrangler/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def decorator(func: FunctionType) -> FunctionType:

@wraps(func)
def inner(*args: Any, **kwargs: Any) -> Any:
passed_unsupported_kwargs = set(unsupported_kwargs).intersection( # type: ignore
passed_unsupported_kwargs = set(unsupported_kwargs).intersection(
set([key for key, value in kwargs.items() if value is not None])
)

Expand Down
5 changes: 2 additions & 3 deletions awswrangler/athena/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
List,
NamedTuple,
Optional,
Sequence,
Tuple,
TypedDict,
Union,
Expand All @@ -36,7 +35,7 @@
from ._cache import _cache_manager, _LocalMetadataCacheManager

if TYPE_CHECKING:
from mypy_boto3_glue.type_defs import ColumnTypeDef
from mypy_boto3_glue.type_defs import ColumnOutputTypeDef

_QUERY_FINAL_STATES: List[str] = ["FAILED", "SUCCEEDED", "CANCELLED"]
_QUERY_WAIT_POLLING_DELAY: float = 1.0 # SECONDS
Expand Down Expand Up @@ -964,7 +963,7 @@ def generate_create_query(

"""

def parse_columns(columns_description: Sequence["ColumnTypeDef"]) -> str:
def parse_columns(columns_description: List["ColumnOutputTypeDef"]) -> str:
columns_str: List[str] = []
for column in columns_description:
column_str = f" `{column['Name']}` {column['Type']}"
Expand Down
4 changes: 2 additions & 2 deletions awswrangler/data_api/rds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def _execute_statement(
def function(sql: str) -> "ExecuteStatementResponseTypeDef":
return self.client.execute_statement(
resourceArn=self.resource_arn,
database=database, # type: ignore[arg-type]
database=database,
sql=sql,
secretArn=self.secret_arn,
includeResultMetadata=True,
Expand Down Expand Up @@ -196,7 +196,7 @@ def _batch_execute_statement(
def function(sql: str) -> "BatchExecuteStatementResponseTypeDef":
return self.client.batch_execute_statement(
resourceArn=self.resource_arn,
database=database, # type: ignore[arg-type]
database=database,
sql=sql,
secretArn=self.secret_arn,
**additional_kwargs,
Expand Down
4 changes: 2 additions & 2 deletions awswrangler/s3/_read_deltalake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _set_default_storage_options_kwargs(
@_utils.check_optional_dependency(deltalake, "deltalake")
@apply_configs
def read_deltalake(
path: Optional[str] = None,
path: str,
version: Optional[int] = None,
partitions: Optional[List[Tuple[str, str, Any]]] = None,
columns: Optional[List[str]] = None,
Expand All @@ -54,7 +54,7 @@ def read_deltalake(

Parameters
----------
path: Optional[str]
path: str
The path of the DeltaTable.
version: Optional[int]
The version of the DeltaTable.
Expand Down
4 changes: 2 additions & 2 deletions awswrangler/s3/_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def _select_object_content(
for event in response["Payload"]:
if "Records" in event:
records = (
event["Records"]["Payload"] # type: ignore[index]
.decode( # type: ignore[attr-defined]
event["Records"]["Payload"]
.decode(
encoding="utf-8",
errors="ignore",
)
Expand Down
3,047 changes: 1,654 additions & 1,393 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ python = ">=3.8, <4.0"
# Required
boto3 = "^1.20.32"
botocore = "^1.23.32"
pandas = ">=1.2.0,!=1.5.0,<3.0.0" # Exclusion per: https://github.com/aws/aws-sdk-pandas/issues/1678
pandas = ">=1.2.0,<3.0.0"
numpy = "^1.18"
pyarrow = ">=7.0.0"
typing-extensions = "^4.4.0"
Expand All @@ -56,11 +56,11 @@ jsonpath-ng = { version = "^1.5.3", optional = true }
# Other
openpyxl = { version = "^3.0.0", optional = true }
progressbar2 = { version = "^4.0.0", optional = true }
deltalake = { version = ">=0.6.4,<0.10.0", optional = true }
deltalake = { version = ">=0.6.4,<0.11.0", optional = true }

# Distributed
modin = { version = "^0.22.2", optional = true }
ray = { version = ">=2.0.0,<2.6.0", extras = ["default", "data"], optional = true }
ray = { version = ">=2.0.0,<2.7.0", extras = ["default", "data"], optional = true }

[tool.poetry.extras]
redshift = ["redshift-connector"]
Expand Down
Loading