-
Notifications
You must be signed in to change notification settings - Fork 581
Add support for environment context #3441
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| from pyiceberg import __version__ | ||
|
|
||
|
|
||
| class EnvironmentContext: | ||
| """Environment context carrying the engine name and version for snapshot summaries.""" | ||
|
|
||
| @staticmethod | ||
| def get() -> dict[str, str]: | ||
| """Return a new dictionary containing only the engine name and version.""" | ||
| return { | ||
| "engine-name": "pyiceberg", | ||
| "engine-version": __version__, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,7 @@ | |
| from pytest_lazy_fixtures import lf | ||
|
|
||
| from pyiceberg.catalog import Catalog, load_catalog | ||
| from pyiceberg.environment_context import EnvironmentContext | ||
| from pyiceberg.expressions import BoundReference | ||
| from pyiceberg.io import ( | ||
| ADLS_ACCOUNT_KEY, | ||
|
|
@@ -104,12 +105,29 @@ | |
| from pyiceberg.io.pyarrow import PyArrowFileIO | ||
|
|
||
|
|
||
| _original_environment_context_get = EnvironmentContext.get | ||
|
|
||
|
|
||
| def pytest_collection_modifyitems(items: list[pytest.Item]) -> None: | ||
| for item in items: | ||
| if not any(item.iter_markers()): | ||
| item.add_marker("unmarked") | ||
|
|
||
|
|
||
| @pytest.fixture(autouse=True, scope="session") | ||
| def _disable_environment_context() -> Generator[None, None, None]: | ||
|
Comment on lines
+117
to
+118
Contributor
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 allows us to not make a lot of changes to existing tests |
||
| """Disable engine metadata for existing tests, including session-scoped fixtures.""" | ||
| with pytest.MonkeyPatch.context() as monkeypatch: | ||
| monkeypatch.setattr(EnvironmentContext, "get", staticmethod(dict)) | ||
| yield | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def enable_environment_context(monkeypatch: pytest.MonkeyPatch) -> None: | ||
| """Restore real engine metadata for tests that explicitly request it.""" | ||
| monkeypatch.setattr(EnvironmentContext, "get", staticmethod(_original_environment_context_get)) | ||
|
|
||
|
|
||
| @pytest.fixture(autouse=True, scope="session") | ||
| def _isolate_pyiceberg_config() -> None: | ||
| """Make test runs ignore your local PyIceberg config. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| from pyiceberg import __version__ | ||
| from pyiceberg.environment_context import EnvironmentContext | ||
|
|
||
|
|
||
| def test_get_returns_fresh_engine_metadata(enable_environment_context: None) -> None: | ||
| first = EnvironmentContext.get() | ||
| second = EnvironmentContext.get() | ||
| assert first is not second | ||
|
|
||
| first.clear() | ||
|
|
||
| assert second == { | ||
| "engine-name": "pyiceberg", | ||
| "engine-version": __version__, | ||
| } | ||
| assert EnvironmentContext.get() == second |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 think this is the best because we dont want to accidentally allow
EnvironmentContextoverride other summary