Skip to content

Commit a0aae4d

Browse files
committed
Merge branch 'main' into feature/write-to-branch
2 parents 958aac4 + a67c559 commit a0aae4d

7 files changed

Lines changed: 206 additions & 262 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ coverage.xml
3535
.project
3636
.settings
3737
bin/
38+
.vscode/
3839

3940
# Hive/metastore files
4041
metastore_db/

dev/docker-compose-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ services:
8181
- AWS_REGION=us-east-1
8282
entrypoint: >
8383
/bin/sh -c "
84-
until (/usr/bin/mc config host add minio http://minio:9000 admin password) do echo '...waiting...' && sleep 1; done;
84+
until (/usr/bin/mc alias set minio http://minio:9000 admin password) do echo '...waiting...' && sleep 1; done;
8585
/usr/bin/mc mb minio/warehouse;
8686
/usr/bin/mc policy set public minio/warehouse;
8787
tail -f /dev/null

dev/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
- AWS_REGION=us-east-1
3939
entrypoint: >
4040
/bin/sh -c "
41-
until (/usr/bin/mc config host add minio http://minio:9000 admin password) do echo '...waiting...' && sleep 1; done;
41+
until (/usr/bin/mc alias set minio http://minio:9000 admin password) do echo '...waiting...' && sleep 1; done;
4242
/usr/bin/mc rm -r --force minio/warehouse;
4343
/usr/bin/mc mb minio/warehouse;
4444
/usr/bin/mc policy set public minio/warehouse;

poetry.lock

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

pyiceberg/table/update/validate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
VALIDATE_DATA_FILES_EXIST_OPERATIONS = {Operation.OVERWRITE, Operation.REPLACE, Operation.DELETE}
2828

2929

30-
def validation_history(
30+
def _validation_history(
3131
table: Table,
3232
from_snapshot: Snapshot,
3333
to_snapshot: Snapshot,
@@ -100,7 +100,7 @@ def _deleted_data_files(
100100
if parent_snapshot is None:
101101
return
102102

103-
manifests, snapshot_ids = validation_history(
103+
manifests, snapshot_ids = _validation_history(
104104
table,
105105
parent_snapshot,
106106
starting_snapshot,

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ huggingface-hub = { version = ">=0.24.0", optional = true }
8080
psycopg2-binary = { version = ">=2.9.6", optional = true }
8181
sqlalchemy = { version = "^2.0.18", optional = true }
8282
getdaft = { version = ">=0.2.12", optional = true }
83-
cachetools = "^5.5.0"
83+
cachetools = ">=5.5,<7.0"
8484
pyiceberg-core = { version = "^0.4.0", optional = true }
8585
polars = { version = "^1.21.0", optional = true }
8686
thrift-sasl = { version = ">=0.4.3", optional = true }
@@ -96,11 +96,11 @@ coverage = { version = "^7.4.2", extras = ["toml"] }
9696
requests-mock = "1.12.1"
9797
moto = { version = "^5.0.2", extras = ["server"] }
9898
typing-extensions = "4.13.2"
99-
pytest-mock = "3.14.0"
100-
pyspark = "3.5.5"
99+
pytest-mock = "3.14.1"
100+
pyspark = "3.5.6"
101101
cython = "3.1.1"
102102
deptry = ">=0.14,<0.24"
103-
datafusion = ">=44,<47"
103+
datafusion = ">=44,<48"
104104
docutils = "!=0.21.post1" # https://github.com/python-poetry/poetry/issues/9248#issuecomment-2026240520
105105

106106
[tool.poetry.group.docs.dependencies]
@@ -109,9 +109,9 @@ mkdocs = "1.6.1"
109109
griffe = "1.7.3"
110110
jinja2 = "3.1.6"
111111
mkdocstrings = "0.29.1"
112-
mkdocstrings-python = "1.16.10"
112+
mkdocstrings-python = "1.16.11"
113113
mkdocs-literate-nav = "0.6.2"
114-
mkdocs-autorefs = "1.4.1"
114+
mkdocs-autorefs = "1.4.2"
115115
mkdocs-gen-files = "0.5.0"
116116
mkdocs-material = "9.6.14"
117117
mkdocs-material-extensions = "1.3.1"

tests/table/test_validate.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from pyiceberg.manifest import ManifestContent, ManifestEntry, ManifestEntryStatus, ManifestFile
2626
from pyiceberg.table import Table
2727
from pyiceberg.table.snapshots import Operation, Snapshot, Summary
28-
from pyiceberg.table.update.validate import _deleted_data_files, _validate_deleted_data_files, validation_history
28+
from pyiceberg.table.update.validate import _deleted_data_files, _validate_deleted_data_files, _validation_history
2929

3030

3131
@pytest.fixture
@@ -69,7 +69,7 @@ def mock_read_manifest_side_effect(self: Snapshot, io: FileIO) -> list[ManifestF
6969
return []
7070

7171
with patch("pyiceberg.table.snapshots.Snapshot.manifests", new=mock_read_manifest_side_effect):
72-
manifests, snapshots = validation_history(
72+
manifests, snapshots = _validation_history(
7373
table,
7474
oldest_snapshot,
7575
newest_snapshot,
@@ -99,7 +99,7 @@ def test_validation_history_fails_on_snapshot_with_no_summary(
9999
)
100100
with patch("pyiceberg.table.update.validate.ancestors_between", return_value=[snapshot_with_no_summary]):
101101
with pytest.raises(ValidationException):
102-
validation_history(
102+
_validation_history(
103103
table,
104104
oldest_snapshot,
105105
newest_snapshot,
@@ -129,7 +129,7 @@ def mock_read_manifest_side_effect(self: Snapshot, io: FileIO) -> list[ManifestF
129129
with patch("pyiceberg.table.snapshots.Snapshot.manifests", new=mock_read_manifest_side_effect):
130130
with patch("pyiceberg.table.update.validate.ancestors_between", return_value=missing_oldest_snapshot):
131131
with pytest.raises(ValidationException):
132-
validation_history(
132+
_validation_history(
133133
table,
134134
oldest_snapshot,
135135
newest_snapshot,

0 commit comments

Comments
 (0)