Merge remote-tracking branch 'origin/main' into fix-formulaic-reference

src/tabmat/formula.py

@@ -10,7 +10,6 @@
 from formulaic import ModelMatrix, ModelSpec
 from formulaic.errors import FactorEncodingError
 from formulaic.materializers import FormulaMaterializer
-from formulaic.materializers.base import EncodedTermStructure
 from formulaic.materializers.types import FactorValues, NAAction, ScopedTerm
 from formulaic.parser.types import Term
 from formulaic.transforms import stateful_transform
@@ -24,6 +23,11 @@
 from .sparse_matrix import SparseMatrix
 from .split_matrix import SplitMatrix
 
+try:
+    from formulaic.materializers.base import EncodedTermStructure
+except ImportError:
+    from formulaic.materializers.types.formula_materializer import EncodedTermStructure
+
 
 class TabmatMaterializer(FormulaMaterializer):
     """Materializer for pandas input and tabmat output."""