Skip to content

Commit e7acaf0

Browse files
authored
Merge branch 'main' into feature/iceberg-merge-into-full-functionality
2 parents 579d428 + 2371f80 commit e7acaf0

File tree

9 files changed

+3011
-2097
lines changed

9 files changed

+3011
-2097
lines changed

.github/workflows/pr-linter.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ on:
1010

1111
jobs:
1212
lint:
13+
name: Validate PR title
1314
runs-on: ubuntu-latest
1415
permissions:
15-
statuses: write
16+
pull-requests: read
1617
steps:
17-
- uses: aslafy-z/conventional-pr-title-action@v3
18+
- uses: amannn/action-semantic-pull-request@v6
1819
env:
1920
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ def to_iceberg( # noqa: PLR0913
707707
keep_files=False,
708708
data_source=data_source,
709709
workgroup=workgroup,
710+
s3_output=s3_output,
710711
encryption=encryption,
711712
kms_key=kms_key,
712713
boto3_session=boto3_session,
@@ -722,6 +723,7 @@ def to_iceberg( # noqa: PLR0913
722723
wg_config=wg_config,
723724
database=database,
724725
data_source=data_source,
726+
s3_output=s3_output,
725727
encryption=encryption,
726728
kms_key=kms_key,
727729
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:

awswrangler/s3/_read_deltalake.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def _set_default_storage_options_kwargs(
2525
) -> dict[str, Any]:
2626
defaults = {key.upper(): value for key, value in _utils.boto3_to_primitives(boto3_session=boto3_session).items()}
2727
defaults["AWS_REGION"] = defaults.pop("REGION_NAME")
28+
defaults["AWS_SESSION_TOKEN"] = "" if defaults["AWS_SESSION_TOKEN"] is None else defaults["AWS_SESSION_TOKEN"]
2829
s3_additional_kwargs = s3_additional_kwargs or {}
2930
return {
3031
**defaults,

awswrangler/s3/_write_deltalake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def _set_default_storage_options_kwargs(
2929
) -> dict[str, Any]:
3030
defaults = {key.upper(): value for key, value in _utils.boto3_to_primitives(boto3_session=boto3_session).items()}
3131
defaults["AWS_REGION"] = defaults.pop("REGION_NAME")
32-
32+
defaults["AWS_SESSION_TOKEN"] = "" if defaults["AWS_SESSION_TOKEN"] is None else defaults["AWS_SESSION_TOKEN"]
3333
s3_additional_kwargs = s3_additional_kwargs or {}
3434

3535
s3_lock_arguments = {}

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 \

uv.lock

Lines changed: 2998 additions & 2091 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)