Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 21 additions & 9 deletions src/rootfilespec/bootstrap/RAnchor.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
from collections.abc import Callable
from typing import Annotated
from typing import TYPE_CHECKING, Annotated

from rootfilespec.bootstrap.streamedobject import StreamedObject
from rootfilespec.rntuple.envelope import REnvelopeLocator
from rootfilespec.rntuple.footer import FooterEnvelope
from rootfilespec.rntuple.header import HeaderEnvelope
from rootfilespec.rntuple.RLocator import LargeLocator
from rootfilespec.serializable import (
Locator,
ReadBuffer,
Expand All @@ -14,6 +10,14 @@
)
from rootfilespec.structutil import Fmt

# rootfilespec.rntuple imports rootfilespec.bootstrap (for compression), whose
# __init__ imports this module, so the rntuple names are imported where they are
# used rather than here (#119)
if TYPE_CHECKING:
from rootfilespec.rntuple.envelope import REnvelopeLocator
from rootfilespec.rntuple.footer import FooterEnvelope
from rootfilespec.rntuple.header import HeaderEnvelope


@serializable
class ROOT3a3aRNTuple(StreamedObject):
Expand All @@ -30,17 +34,25 @@ class ROOT3a3aRNTuple(StreamedObject):
fMaxKeySize: Annotated[int, Fmt(">Q")]

@property
def header_locator(self) -> REnvelopeLocator[HeaderEnvelope]:
def header_locator(self) -> "REnvelopeLocator[HeaderEnvelope]":
"""Get a locator for the RNTuple Header Envelope."""
from rootfilespec.rntuple.envelope import REnvelopeLocator
from rootfilespec.rntuple.header import HeaderEnvelope
from rootfilespec.rntuple.RLocator import LargeLocator

return REnvelopeLocator(
self.fLenHeader,
LargeLocator(self.fNBytesHeader, self.fSeekHeader),
HeaderEnvelope,
)

@property
def footer_locator(self) -> REnvelopeLocator[FooterEnvelope]:
def footer_locator(self) -> "REnvelopeLocator[FooterEnvelope]":
"""Get a locator for the RNTuple Footer Envelope."""
from rootfilespec.rntuple.envelope import REnvelopeLocator
from rootfilespec.rntuple.footer import FooterEnvelope
from rootfilespec.rntuple.RLocator import LargeLocator

return REnvelopeLocator(
self.fLenFooter,
LargeLocator(self.fNBytesFooter, self.fSeekFooter),
Expand All @@ -49,15 +61,15 @@ def footer_locator(self) -> REnvelopeLocator[FooterEnvelope]:

def get_header(
self, fetch_data: Callable[[Locator[ROOTSerializable]], ReadBuffer]
) -> HeaderEnvelope:
) -> "HeaderEnvelope":
"""Reads the RNTuple Header Envelope from the given buffer."""
loc = self.header_locator
buffer = fetch_data(loc)
return loc.read_from(buffer)

def get_footer(
self, fetch_data: Callable[[Locator[ROOTSerializable]], ReadBuffer]
) -> FooterEnvelope:
) -> "FooterEnvelope":
"""Reads the RNTuple Footer Envelope from the given buffer."""
loc = self.footer_locator
buffer = fetch_data(loc)
Expand Down
46 changes: 46 additions & 0 deletions tests/test_imports.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import pkgutil
import subprocess
import sys

import pytest

import rootfilespec

MODULES = sorted(
info.name
for info in pkgutil.walk_packages(rootfilespec.__path__, "rootfilespec.")
if ".generated" not in info.name
)

# The same shape as #119 outside RNTuple: rootfilespec.container imports
# rootfilespec.bootstrap, whose array module imports rootfilespec.container
KNOWN_CYCLES = {"rootfilespec.container"}


@pytest.mark.parametrize(
"module",
[
pytest.param(
m,
marks=pytest.mark.xfail(
strict=True, reason="circular import through rootfilespec.bootstrap"
),
)
if m in KNOWN_CYCLES
else m
for m in MODULES
],
)
def test_import_alone(module: str):
"""Issue #119: every module imports in a fresh interpreter, on its own

Importing rootfilespec.rntuple.* before rootfilespec.bootstrap used to fail
with a circular import.
"""
result = subprocess.run(
[sys.executable, "-c", f"import {module}"],
capture_output=True,
text=True,
check=False,
)
assert result.returncode == 0, result.stderr
Loading