Skip to content

Commit 5afdf7f

Browse files
authored
Merge branch 'main' into fix/deltars_session_string
2 parents cd6770a + 9b84384 commit 5afdf7f

File tree

6 files changed

+3005
-2094
lines changed

6 files changed

+3005
-2094
lines changed

awswrangler/_distributed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def get(cls) -> MemoryFormatEnum:
177177
return cls._enum if cls._enum else cls.get_installed()
178178

179179
@classmethod
180-
def set(cls, name: EngineLiteral) -> None:
180+
def set(cls, name: MemoryFormatLiteral) -> None:
181181
"""Set the memory format."""
182182
with cls._lock:
183183
cls._enum = MemoryFormatEnum[name.upper()]

awswrangler/athena/_write_iceberg.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ def to_iceberg( # noqa: PLR0913
578578
keep_files=False,
579579
data_source=data_source,
580580
workgroup=workgroup,
581+
s3_output=s3_output,
581582
encryption=encryption,
582583
kms_key=kms_key,
583584
boto3_session=boto3_session,

awswrangler/oracle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ def detect_oracle_decimal_datatype(cursor: Any) -> dict[str, pa.DataType]:
607607
if isinstance(cursor, oracledb.Cursor):
608608
# Oracle stores DECIMAL as the NUMBER type
609609

610-
for name, db_type, display_size, internal_size, precision, scale, null_ok in cursor.description:
610+
for name, db_type, display_size, internal_size, precision, scale, null_ok in cursor.description: # type: ignore
611611
_logger.debug((name, db_type, display_size, internal_size, precision, scale, null_ok))
612612

613613
if db_type == oracledb.DB_TYPE_NUMBER and scale is not None and scale > 0:

test_infra/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "awswrangler-test-infrastructure"
33
version = "3.13.0"
44
description = "CDK test infrastructure for AWS SDK for pandas"
5-
authors = ["Amazon Web Services"]
5+
authors = [{ name = "Amazon Web Services" }]
66
license = {text = "Apache-2.0"}
77
requires-python = ">=3.9, <4.0"
88

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ envlist = py{39,310,311,312,313}
33
isolated_build = True
44

55
[testenv]
6+
runner = uv-venv-lock-runner
67
passenv =
78
AWS_PROFILE
89
AWS_DEFAULT_REGION
@@ -15,6 +16,7 @@ allowlist_externals =
1516
pytest
1617
uv
1718
commands_pre =
19+
uv pip install pyarrow==20.0.0
1820
uv sync --frozen --verbose --extra deltalake --extra gremlin --extra mysql --extra opencypher --extra opensearch --extra oracle --extra postgres --extra redshift --extra sparql --extra sqlserver --extra geopandas
1921
commands =
2022
uv run pytest -n {posargs} -s -v --timeout=600 --reruns=1 --reruns-delay=30 \
@@ -38,6 +40,7 @@ allowlist_externals =
3840
pytest
3941
uv
4042
commands_pre =
43+
uv pip install pyarrow==20.0.0
4144
uv sync --frozen --verbose --all-extras
4245
commands =
4346
uv run pytest -n {posargs} -s -v --timeout=600 --reruns=1 --reruns-delay=30 \

0 commit comments

Comments
 (0)