Skip to content

infra: upgrade pytest and use pytest_lazy_fixtures #2978

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

Merged
Fokko merged 3 commits into from
Feb 7, 2026
+176 −167
Merged

infra: upgrade pytest and use pytest_lazy_fixtures #2978

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
bd70e75
upgrade pytest and use latest pytest-lazy-fixtures
kevinjqliu Jan 29, 2026
1862b80
use new pytest_lazy_fixtures
kevinjqliu Jan 29, 2026
8ec0f0e
Merge remote-tracking branch 'origin/main' into kevinjqliu/upgrade-py…
kevinjqliu Jan 30, 2026
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
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ entra-auth = ["azure-identity>=1.25.1"]

[dependency-groups]
dev = [
"pytest==7.4.4",
"pytest==9.0.2",
"pytest-checkdocs==2.14.0",
"prek>=0.2.1,<0.4",
"pytest-lazy-fixture==0.6.3",
"pytest-lazy-fixtures==1.4.0",
"fastavro==1.12.1",
"coverage[toml]>=7.4.2,<8",
"requests-mock==1.12.1",
Expand Down
10 changes: 5 additions & 5 deletions tests/catalog/test_catalog_behaviors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import pyarrow as pa
import pytest
from pydantic_core import ValidationError
from pytest_lazyfixture import lazy_fixture
from pytest_lazy_fixtures import lf
Copy link
Contributor

@Fokko Fokko Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love the shorthand 👍

from sqlalchemy.exc import IntegrityError

from pyiceberg.catalog import Catalog
Expand Down Expand Up @@ -323,10 +323,10 @@ def test_write_pyarrow_schema(catalog: Catalog, test_table_identifier: Identifie
@pytest.mark.parametrize(
"schema,expected",
[
(lazy_fixture("pyarrow_schema_simple_without_ids"), lazy_fixture("iceberg_schema_simple_no_ids")),
(lazy_fixture("table_schema_simple"), lazy_fixture("table_schema_simple")),
(lazy_fixture("table_schema_nested"), lazy_fixture("table_schema_nested")),
(lazy_fixture("pyarrow_schema_nested_without_ids"), lazy_fixture("iceberg_schema_nested_no_ids")),
(lf("pyarrow_schema_simple_without_ids"), lf("iceberg_schema_simple_no_ids")),
(lf("table_schema_simple"), lf("table_schema_simple")),
(lf("table_schema_nested"), lf("table_schema_nested")),
(lf("pyarrow_schema_nested_without_ids"), lf("iceberg_schema_nested_no_ids")),
],
)
def test_convert_schema_if_needed(
Expand Down
22 changes: 10 additions & 12 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import pytest
from moto import mock_aws
from pydantic_core import to_json
from pytest_lazyfixture import lazy_fixture
from pytest_lazy_fixtures import lf

from pyiceberg.catalog import Catalog, load_catalog
from pyiceberg.catalog.memory import InMemoryCatalog
Expand Down Expand Up @@ -3080,23 +3080,21 @@ def fixed_test_table_namespace() -> Identifier:


@pytest.fixture(
scope="session",
Copy link
Contributor

@geruh geruh Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see scope="session" was removed from these fixtures, and the tests still pass was this not needed?

Copy link
Contributor Author

@kevinjqliu kevinjqliu Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is removed because its references (random_table_identifier for example) is function scoped. so this needs to be function scoped too.

I think this is a new requirement from pytest-lazy-fixtures

params=[
lazy_fixture("fixed_test_table_identifier"),
lazy_fixture("random_table_identifier"),
lazy_fixture("random_hierarchical_identifier"),
lf("fixed_test_table_identifier"),
lf("random_table_identifier"),
lf("random_hierarchical_identifier"),
],
)
def test_table_identifier(request: pytest.FixtureRequest) -> Identifier:
return request.param


@pytest.fixture(
scope="session",
params=[
lazy_fixture("another_fixed_test_table_identifier"),
lazy_fixture("another_random_table_identifier"),
lazy_fixture("another_random_hierarchical_identifier"),
lf("another_fixed_test_table_identifier"),
lf("another_random_table_identifier"),
lf("another_random_hierarchical_identifier"),
],
)
def another_table_identifier(request: pytest.FixtureRequest) -> Identifier:
Expand All @@ -3105,9 +3103,9 @@ def another_table_identifier(request: pytest.FixtureRequest) -> Identifier:

@pytest.fixture(
params=[
lazy_fixture("database_name"),
lazy_fixture("hierarchical_namespace_name"),
lazy_fixture("fixed_test_table_namespace"),
lf("database_name"),
lf("hierarchical_namespace_name"),
lf("fixed_test_table_namespace"),
],
)
def test_namespace(request: pytest.FixtureRequest) -> Identifier:
Expand Down
13 changes: 7 additions & 6 deletions tests/integration/test_catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from pathlib import Path, PosixPath

import pytest
from pytest_lazy_fixtures import lf

from pyiceberg.catalog import Catalog, MetastoreCatalog, load_catalog
from pyiceberg.catalog.hive import HiveCatalog
Expand Down Expand Up @@ -109,12 +110,12 @@ def hive_catalog() -> Generator[Catalog, None, None]:


CATALOGS = [
pytest.lazy_fixture("memory_catalog"),
pytest.lazy_fixture("sqlite_catalog_memory"),
pytest.lazy_fixture("sqlite_catalog_file"),
pytest.lazy_fixture("rest_catalog"),
pytest.lazy_fixture("hive_catalog"),
pytest.lazy_fixture("rest_test_catalog"),
lf("memory_catalog"),
lf("sqlite_catalog_memory"),
lf("sqlite_catalog_file"),
lf("rest_catalog"),
lf("hive_catalog"),
lf("rest_test_catalog"),
]


Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_inspect_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import pytest
import pytz
from pyspark.sql import DataFrame, SparkSession
from pytest_lazy_fixtures import lf

from pyiceberg.catalog import Catalog
from pyiceberg.exceptions import NoSuchTableError
Expand Down Expand Up @@ -672,7 +673,7 @@ def test_inspect_partitions_partitioned_with_filter(spark: SparkSession, session


@pytest.mark.integration
@pytest.mark.parametrize("catalog", [pytest.lazy_fixture("session_catalog")])
@pytest.mark.parametrize("catalog", [lf("session_catalog")])
def test_inspect_partitions_partitioned_transform_with_filter(spark: SparkSession, catalog: Catalog) -> None:
for table_name, predicate, partition_predicate in [
("test_partitioned_by_identity", "ts >= '2023-03-05T00:00:00+00:00'", "ts >= '2023-03-05T00:00:00+00:00'"),
Expand Down
Loading