Skip to content
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

Schema updates for current and upcoming asdf changes #910

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
import SerializationContext from asdf.extension for version >3
  • Loading branch information
braingram committed Nov 19, 2024
commit c764b6bcaf450516bd954960013d964cc15e8e4f
7 changes: 6 additions & 1 deletion weldx/asdf/types.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,12 @@
import functools
import re

from asdf.asdf import SerializationContext
import asdf

if asdf.__version__ >= "3.0.0":
from asdf.extension import SerializationContext
else:
from asdf.asdf import SerializationContext
from asdf.extension import Converter
from asdf.versioning import AsdfSpec
from boltons.iterutils import remap
8 changes: 6 additions & 2 deletions weldx/asdf/util.py
Original file line number Diff line number Diff line change
@@ -12,7 +12,11 @@

import asdf
import pint
from asdf.asdf import SerializationContext

if asdf.__version__ >= "3.0.0":
from asdf.extension import SerializationContext
else:
from asdf.asdf import SerializationContext
from asdf.config import AsdfConfig, get_config
from asdf.extension import Extension
from asdf.tagged import TaggedDict, TaggedList, TaggedString
@@ -502,7 +506,7 @@ def from_yaml_tree(

def get_weldx_extension(ctx: SerializationContext | AsdfConfig) -> Extension:
"""Grab the weldx extension from list of current active extensions."""
if isinstance(ctx, asdf.asdf.SerializationContext):
if isinstance(ctx, SerializationContext):
extensions = ctx.extension_manager.extensions
elif isinstance(ctx, asdf.config.AsdfConfig):
extensions = ctx.extensions
7 changes: 6 additions & 1 deletion weldx/tags/base_types.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,12 @@

from uuid import UUID

from asdf.asdf import SerializationContext
import asdf

if asdf.__version__ >= "3.0.0":
from asdf.extension import SerializationContext
else:
from asdf.asdf import SerializationContext

from weldx.asdf.types import WeldxConverter