Skip to content
Merged
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
1 change: 1 addition & 0 deletions scripts/archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from deepdiff import DeepDiff

_RAD_URLS = (
"https://github.com/spacetelescope/rad",
"https://github.com/spacetelescope/rad.git",
"git@github.com:spacetelescope/rad.git",
)
Expand Down
12 changes: 3 additions & 9 deletions src/rad/_parser/_super_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,16 @@
import copy
from collections import abc
from typing import TYPE_CHECKING
from urllib.parse import urldefrag

import asdf
import asdf.schema
import asdf.treeutil
from astropy.utils import minversion
from asdf.generic_io import resolve_uri

if TYPE_CHECKING:
from typing import Any

if not minversion("asdf", "5.0.0"):
from functools import partial

_safe_resolve = partial(asdf.schema._safe_resolve, None)
else:
_safe_resolve = asdf.schema._safe_resolve


__all__ = ["super_schema"]

Expand All @@ -45,7 +39,7 @@ def resolve_refs(node, json_id):
json_id = schema_uri

if isinstance(node, dict) and "$ref" in node:
suburl_base, suburl_fragment = _safe_resolve(json_id, node["$ref"])
suburl_base, suburl_fragment = urldefrag(resolve_uri(json_id, node["$ref"]))

if suburl_base == schema_uri or suburl_base == schema.get("id"):
# This is a local ref, which we'll resolve in both cases.
Expand Down
Loading