Merge pull request #400 from braingram/revert_360

Revert "Merge pull request #360 from WilliamJamieson/refactor/layout"
asdf-format · Sep 5, 2023 · b756938 · b756938
2 parents 4e461f3 + 19a4d91
commit b756938
Show file tree

Hide file tree

Showing 81 changed files with 254 additions and 255 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,8 +41,6 @@ jobs:
     with:
       upload_to_pypi: false
       upload_to_anaconda: false
-      test_extras: test
-      test_command: pytest --pyargs asdf_standard
 
   asdf-dev:
     name: Run asdf-development tests

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,7 +9,6 @@ The stable ASDF Standard is v1.5.0
 - Bugfix for ``base_format`` in ``time-1.2.0`` schema. [#349]
 - Add new ``ndarray-1.1.0`` schema to fix #345 [#350]
 - Remove ``unit-1.1.0`` erroneously added in #350 [#355]
-- Refactor file layout [#360]
 - Fix URI fragment format in metaschema references. [#373]
 - Fix URI fragment format in quantity-1.2 schema [#374]
 - Drop support for python 3.8 [#390]

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -238,7 +238,7 @@
 # -- sphinx_asdf configuration ---------------------------------------------
 
 # Top-level directory containing ASDF schemas (relative to current directory)
-asdf_schema_path = "../../src/asdf_standard/resources/schemas"
+asdf_schema_path = "../../resources/schemas"
 # This is the prefix common to all schema IDs in this repository
 asdf_schema_standard_prefix = "stsci.edu/asdf"
 # This seems pretty redundant/unnecessary and should probably be fixed in the

diff --git a/docs/source/schemas/manifest.rst b/docs/source/schemas/manifest.rst
@@ -6,7 +6,7 @@ The ASDF tags (described by schemas) available under each ASDF standard version
 by a single manifest document for that ASDF standard version.
 
 .. asdf-autoschemas::
-   :schema_root: ../../src/asdf_standard/resources/manifests
+   :schema_root: ../../resources/manifests
    :standard_prefix: asdf-format.org/core
 
    core-1.0.0

diff --git a/docs/source/schemas/yaml_schema.rst b/docs/source/schemas/yaml_schema.rst
@@ -26,7 +26,7 @@ Writing a new schema is described in :ref:`extending-asdf`.
 .. _yaml-schema-draft-01:
 
 .. asdf-schema::
-   :schema_root: ../../src/asdf_standard/resources/schemas/stsci.edu
+   :schema_root: ../../resources/schemas/stsci.edu
    :standard_prefix:
 
    yaml-schema/draft-01
diff --git a/pyproject.toml b/pyproject.toml
@@ -61,14 +61,14 @@ write_to = "src/asdf_standard/_version.py"
 packages = ["asdf_standard", "asdf_standard.resources"]
 
 [tool.setuptools.package-data]
-"asdf_standard.resources" = ["src/asdf_standard/resources/**/*.yaml"]
+"asdf_standard.resources" = ["resources/**/*.yaml"]
 
 [tool.setuptools.package-dir]
 "" = "src"
-"asdf_standard.resources" = "src/asdf_standard/resources"
+"asdf_standard.resources" = "resources"
 
 [tool.pytest.ini_options]
-asdf_schema_root = 'src/asdf_standard/resources/schemas'
+asdf_schema_root = 'resources/schemas'
 asdf_schema_skip_tests = """
     stsci.edu/asdf/asdf-schema-1.0.0.yaml
     stsci.edu/asdf/wcs/celestial_frame-1.0.0.yaml

diff --git a/...ests/asdf-format.org/core/core-1.0.0.yaml → ...ests/asdf-format.org/core/core-1.0.0.yaml b/...ests/asdf-format.org/core/core-1.0.0.yaml → ...ests/asdf-format.org/core/core-1.0.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.1.0.yaml → ...ests/asdf-format.org/core/core-1.1.0.yaml b/...ests/asdf-format.org/core/core-1.1.0.yaml → ...ests/asdf-format.org/core/core-1.1.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.2.0.yaml → ...ests/asdf-format.org/core/core-1.2.0.yaml b/...ests/asdf-format.org/core/core-1.2.0.yaml → ...ests/asdf-format.org/core/core-1.2.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.3.0.yaml → ...ests/asdf-format.org/core/core-1.3.0.yaml b/...ests/asdf-format.org/core/core-1.3.0.yaml → ...ests/asdf-format.org/core/core-1.3.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.4.0.yaml → ...ests/asdf-format.org/core/core-1.4.0.yaml b/...ests/asdf-format.org/core/core-1.4.0.yaml → ...ests/asdf-format.org/core/core-1.4.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.5.0.yaml → ...ests/asdf-format.org/core/core-1.5.0.yaml b/...ests/asdf-format.org/core/core-1.5.0.yaml → ...ests/asdf-format.org/core/core-1.5.0.yaml
diff --git a/...ests/asdf-format.org/core/core-1.6.0.yaml → ...ests/asdf-format.org/core/core-1.6.0.yaml b/...ests/asdf-format.org/core/core-1.6.0.yaml → ...ests/asdf-format.org/core/core-1.6.0.yaml
diff --git a/...at.org/core/extension_manifest-1.0.0.yaml → ...at.org/core/extension_manifest-1.0.0.yaml b/...at.org/core/extension_manifest-1.0.0.yaml → ...at.org/core/extension_manifest-1.0.0.yaml
diff --git a/...mas/stsci.edu/asdf/asdf-schema-1.0.0.yaml → ...mas/stsci.edu/asdf/asdf-schema-1.0.0.yaml b/...mas/stsci.edu/asdf/asdf-schema-1.0.0.yaml → ...mas/stsci.edu/asdf/asdf-schema-1.0.0.yaml
diff --git a/...hemas/stsci.edu/asdf/core/asdf-1.0.0.yaml → ...hemas/stsci.edu/asdf/core/asdf-1.0.0.yaml b/...hemas/stsci.edu/asdf/core/asdf-1.0.0.yaml → ...hemas/stsci.edu/asdf/core/asdf-1.0.0.yaml
diff --git a/...hemas/stsci.edu/asdf/core/asdf-1.1.0.yaml → ...hemas/stsci.edu/asdf/core/asdf-1.1.0.yaml b/...hemas/stsci.edu/asdf/core/asdf-1.1.0.yaml → ...hemas/stsci.edu/asdf/core/asdf-1.1.0.yaml
diff --git a/...mas/stsci.edu/asdf/core/column-1.0.0.yaml → ...mas/stsci.edu/asdf/core/column-1.0.0.yaml b/...mas/stsci.edu/asdf/core/column-1.0.0.yaml → ...mas/stsci.edu/asdf/core/column-1.0.0.yaml
diff --git a/...mas/stsci.edu/asdf/core/column-1.1.0.yaml → ...mas/stsci.edu/asdf/core/column-1.1.0.yaml b/...mas/stsci.edu/asdf/core/column-1.1.0.yaml → ...mas/stsci.edu/asdf/core/column-1.1.0.yaml
diff --git a/...as/stsci.edu/asdf/core/complex-1.0.0.yaml → ...as/stsci.edu/asdf/core/complex-1.0.0.yaml b/...as/stsci.edu/asdf/core/complex-1.0.0.yaml → ...as/stsci.edu/asdf/core/complex-1.0.0.yaml
diff --git a/...s/stsci.edu/asdf/core/constant-1.0.0.yaml → ...s/stsci.edu/asdf/core/constant-1.0.0.yaml b/...s/stsci.edu/asdf/core/constant-1.0.0.yaml → ...s/stsci.edu/asdf/core/constant-1.0.0.yaml
diff --git a/...u/asdf/core/extension_metadata-1.0.0.yaml → ...u/asdf/core/extension_metadata-1.0.0.yaml b/...u/asdf/core/extension_metadata-1.0.0.yaml → ...u/asdf/core/extension_metadata-1.0.0.yaml
diff --git a/...ci.edu/asdf/core/externalarray-1.0.0.yaml → ...ci.edu/asdf/core/externalarray-1.0.0.yaml b/...ci.edu/asdf/core/externalarray-1.0.0.yaml → ...ci.edu/asdf/core/externalarray-1.0.0.yaml
diff --git a/...ci.edu/asdf/core/history_entry-1.0.0.yaml → ...ci.edu/asdf/core/history_entry-1.0.0.yaml b/...ci.edu/asdf/core/history_entry-1.0.0.yaml → ...ci.edu/asdf/core/history_entry-1.0.0.yaml
diff --git a/...as/stsci.edu/asdf/core/integer-1.0.0.yaml → ...as/stsci.edu/asdf/core/integer-1.0.0.yaml b/...as/stsci.edu/asdf/core/integer-1.0.0.yaml → ...as/stsci.edu/asdf/core/integer-1.0.0.yaml
diff --git a/...as/stsci.edu/asdf/core/integer-1.1.0.yaml → ...as/stsci.edu/asdf/core/integer-1.1.0.yaml b/...as/stsci.edu/asdf/core/integer-1.1.0.yaml → ...as/stsci.edu/asdf/core/integer-1.1.0.yaml
diff --git a/...as/stsci.edu/asdf/core/ndarray-1.0.0.yaml → ...as/stsci.edu/asdf/core/ndarray-1.0.0.yaml b/...as/stsci.edu/asdf/core/ndarray-1.0.0.yaml → ...as/stsci.edu/asdf/core/ndarray-1.0.0.yaml
diff --git a/...as/stsci.edu/asdf/core/ndarray-1.1.0.yaml → ...as/stsci.edu/asdf/core/ndarray-1.1.0.yaml b/...as/stsci.edu/asdf/core/ndarray-1.1.0.yaml → ...as/stsci.edu/asdf/core/ndarray-1.1.0.yaml
diff --git a/...s/stsci.edu/asdf/core/software-1.0.0.yaml → ...s/stsci.edu/asdf/core/software-1.0.0.yaml b/...s/stsci.edu/asdf/core/software-1.0.0.yaml → ...s/stsci.edu/asdf/core/software-1.0.0.yaml
diff --git a/...du/asdf/core/subclass_metadata-1.0.0.yaml → ...du/asdf/core/subclass_metadata-1.0.0.yaml b/...du/asdf/core/subclass_metadata-1.0.0.yaml → ...du/asdf/core/subclass_metadata-1.0.0.yaml
diff --git a/...emas/stsci.edu/asdf/core/table-1.0.0.yaml → ...emas/stsci.edu/asdf/core/table-1.0.0.yaml b/...emas/stsci.edu/asdf/core/table-1.0.0.yaml → ...emas/stsci.edu/asdf/core/table-1.0.0.yaml
diff --git a/...emas/stsci.edu/asdf/core/table-1.1.0.yaml → ...emas/stsci.edu/asdf/core/table-1.1.0.yaml b/...emas/stsci.edu/asdf/core/table-1.1.0.yaml → ...emas/stsci.edu/asdf/core/table-1.1.0.yaml
diff --git a/...hemas/stsci.edu/asdf/fits/fits-1.0.0.yaml → ...hemas/stsci.edu/asdf/fits/fits-1.0.0.yaml b/...hemas/stsci.edu/asdf/fits/fits-1.0.0.yaml → ...hemas/stsci.edu/asdf/fits/fits-1.0.0.yaml
diff --git a/...hemas/stsci.edu/asdf/fits/fits-1.1.0.yaml → ...hemas/stsci.edu/asdf/fits/fits-1.1.0.yaml b/...hemas/stsci.edu/asdf/fits/fits-1.1.0.yaml → ...hemas/stsci.edu/asdf/fits/fits-1.1.0.yaml
diff --git a/...hemas/stsci.edu/asdf/time/time-1.0.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.0.0.yaml b/...hemas/stsci.edu/asdf/time/time-1.0.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.0.0.yaml
diff --git a/...hemas/stsci.edu/asdf/time/time-1.1.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.1.0.yaml b/...hemas/stsci.edu/asdf/time/time-1.1.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.1.0.yaml
diff --git a/...hemas/stsci.edu/asdf/time/time-1.2.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.2.0.yaml b/...hemas/stsci.edu/asdf/time/time-1.2.0.yaml → ...hemas/stsci.edu/asdf/time/time-1.2.0.yaml
diff --git a/...as/stsci.edu/asdf/unit/defunit-1.0.0.yaml → ...as/stsci.edu/asdf/unit/defunit-1.0.0.yaml b/...as/stsci.edu/asdf/unit/defunit-1.0.0.yaml → ...as/stsci.edu/asdf/unit/defunit-1.0.0.yaml
diff --git a/...s/stsci.edu/asdf/unit/quantity-1.1.0.yaml → ...s/stsci.edu/asdf/unit/quantity-1.1.0.yaml b/...s/stsci.edu/asdf/unit/quantity-1.1.0.yaml → ...s/stsci.edu/asdf/unit/quantity-1.1.0.yaml
diff --git a/...s/stsci.edu/asdf/unit/quantity-1.2.0.yaml → ...s/stsci.edu/asdf/unit/quantity-1.2.0.yaml b/...s/stsci.edu/asdf/unit/quantity-1.2.0.yaml → ...s/stsci.edu/asdf/unit/quantity-1.2.0.yaml
diff --git a/...hemas/stsci.edu/asdf/unit/unit-1.0.0.yaml → ...hemas/stsci.edu/asdf/unit/unit-1.0.0.yaml b/...hemas/stsci.edu/asdf/unit/unit-1.0.0.yaml → ...hemas/stsci.edu/asdf/unit/unit-1.0.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.0.0.yaml → ...mas/stsci.edu/asdf/version_map-1.0.0.yaml b/...mas/stsci.edu/asdf/version_map-1.0.0.yaml → ...mas/stsci.edu/asdf/version_map-1.0.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.1.0.yaml → ...mas/stsci.edu/asdf/version_map-1.1.0.yaml b/...mas/stsci.edu/asdf/version_map-1.1.0.yaml → ...mas/stsci.edu/asdf/version_map-1.1.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.2.0.yaml → ...mas/stsci.edu/asdf/version_map-1.2.0.yaml b/...mas/stsci.edu/asdf/version_map-1.2.0.yaml → ...mas/stsci.edu/asdf/version_map-1.2.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.3.0.yaml → ...mas/stsci.edu/asdf/version_map-1.3.0.yaml b/...mas/stsci.edu/asdf/version_map-1.3.0.yaml → ...mas/stsci.edu/asdf/version_map-1.3.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.4.0.yaml → ...mas/stsci.edu/asdf/version_map-1.4.0.yaml b/...mas/stsci.edu/asdf/version_map-1.4.0.yaml → ...mas/stsci.edu/asdf/version_map-1.4.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.5.0.yaml → ...mas/stsci.edu/asdf/version_map-1.5.0.yaml b/...mas/stsci.edu/asdf/version_map-1.5.0.yaml → ...mas/stsci.edu/asdf/version_map-1.5.0.yaml
diff --git a/...mas/stsci.edu/asdf/version_map-1.6.0.yaml → ...mas/stsci.edu/asdf/version_map-1.6.0.yaml b/...mas/stsci.edu/asdf/version_map-1.6.0.yaml → ...mas/stsci.edu/asdf/version_map-1.6.0.yaml
diff --git a/...i.edu/asdf/wcs/celestial_frame-1.0.0.yaml → ...i.edu/asdf/wcs/celestial_frame-1.0.0.yaml b/...i.edu/asdf/wcs/celestial_frame-1.0.0.yaml → ...i.edu/asdf/wcs/celestial_frame-1.0.0.yaml
diff --git a/...i.edu/asdf/wcs/celestial_frame-1.1.0.yaml → ...i.edu/asdf/wcs/celestial_frame-1.1.0.yaml b/...i.edu/asdf/wcs/celestial_frame-1.1.0.yaml → ...i.edu/asdf/wcs/celestial_frame-1.1.0.yaml
diff --git a/...i.edu/asdf/wcs/composite_frame-1.0.0.yaml → ...i.edu/asdf/wcs/composite_frame-1.0.0.yaml b/...i.edu/asdf/wcs/composite_frame-1.0.0.yaml → ...i.edu/asdf/wcs/composite_frame-1.0.0.yaml
diff --git a/...i.edu/asdf/wcs/composite_frame-1.1.0.yaml → ...i.edu/asdf/wcs/composite_frame-1.1.0.yaml b/...i.edu/asdf/wcs/composite_frame-1.1.0.yaml → ...i.edu/asdf/wcs/composite_frame-1.1.0.yaml
diff --git a/...hemas/stsci.edu/asdf/wcs/frame-1.0.0.yaml → ...hemas/stsci.edu/asdf/wcs/frame-1.0.0.yaml b/...hemas/stsci.edu/asdf/wcs/frame-1.0.0.yaml → ...hemas/stsci.edu/asdf/wcs/frame-1.0.0.yaml
diff --git a/...hemas/stsci.edu/asdf/wcs/frame-1.1.0.yaml → ...hemas/stsci.edu/asdf/wcs/frame-1.1.0.yaml b/...hemas/stsci.edu/asdf/wcs/frame-1.1.0.yaml → ...hemas/stsci.edu/asdf/wcs/frame-1.1.0.yaml
diff --git a/.../stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml → .../stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml b/.../stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml → .../stsci.edu/asdf/wcs/icrs_coord-1.1.0.yaml
diff --git a/...ci.edu/asdf/wcs/spectral_frame-1.0.0.yaml → ...ci.edu/asdf/wcs/spectral_frame-1.0.0.yaml b/...ci.edu/asdf/wcs/spectral_frame-1.0.0.yaml → ...ci.edu/asdf/wcs/spectral_frame-1.0.0.yaml
diff --git a/...ci.edu/asdf/wcs/spectral_frame-1.1.0.yaml → ...ci.edu/asdf/wcs/spectral_frame-1.1.0.yaml b/...ci.edu/asdf/wcs/spectral_frame-1.1.0.yaml → ...ci.edu/asdf/wcs/spectral_frame-1.1.0.yaml
diff --git a/...chemas/stsci.edu/asdf/wcs/step-1.0.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.0.0.yaml b/...chemas/stsci.edu/asdf/wcs/step-1.0.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.0.0.yaml
diff --git a/...chemas/stsci.edu/asdf/wcs/step-1.1.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.1.0.yaml b/...chemas/stsci.edu/asdf/wcs/step-1.1.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.1.0.yaml
diff --git a/...chemas/stsci.edu/asdf/wcs/step-1.2.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.2.0.yaml b/...chemas/stsci.edu/asdf/wcs/step-1.2.0.yaml → ...chemas/stsci.edu/asdf/wcs/step-1.2.0.yaml
diff --git a/...schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml b/...schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.0.0.yaml
diff --git a/...schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml b/...schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.1.0.yaml
diff --git a/...schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml b/...schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml → ...schemas/stsci.edu/asdf/wcs/wcs-1.2.0.yaml
diff --git a/...hemas/stsci.edu/yaml-schema/draft-01.yaml → ...hemas/stsci.edu/yaml-schema/draft-01.yaml b/...hemas/stsci.edu/yaml-schema/draft-01.yaml → ...hemas/stsci.edu/yaml-schema/draft-01.yaml
diff --git a/src/asdf_standard/integration.py b/src/asdf_standard/integration.py
@@ -1,4 +1,5 @@
 import sys
+from pathlib import Path
 
 if sys.version_info < (3, 9):
     import importlib_resources
@@ -11,7 +12,11 @@
 def get_resource_mappings():
     resources_root = importlib_resources.files(asdf_standard) / "resources"
     if not resources_root.is_dir():
-        raise RuntimeError("Missing resources directory")
+        # In an editable install, the resources directory will exist off the
+        # repository root:
+        resources_root = Path(__file__).absolute().parent.parent.parent / "resources"
+        if not resources_root.is_dir():
+            raise RuntimeError("Missing resources directory")
 
     return [
         asdf_standard.DirectoryResourceMapping(

diff --git a/src/asdf_standard/tests/common.py b/src/asdf_standard/tests/common.py
diff --git a/tests/__init__.py → tests/.gitkeep b/tests/__init__.py → tests/.gitkeep