dkist-header-validator 5.2.0__tar.gz → 5.3.0__tar.gz

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -10,11 +10,12 @@ repos:
     -   id: check-added-large-files
     -   id: debug-statements
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 25.1.0
     hooks:
     -   id: black
         args: [ "-l 100" ]
--   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.3.5
+-   repo: https://github.com/pycqa/isort
+    rev: 5.12.0
     hooks:
-    -   id: reorder-python-imports
+    -   id: isort
+        name: isort (python)

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-header-validator
-Version: 5.2.0
+Version: 5.3.0
 Summary: DKIST data validator
 Home-page: https://bitbucket.org/dkistdc/dkist-header-validator/src/main/
 Author: NSO / AURA

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/__init__.py

@@ -1,4 +1,5 @@
 """Package providing support classes and methods used by all workflow tasks."""
+
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version
 

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/base_validator.py

@@ -1,6 +1,7 @@
 """
 Definition of the base objects for the creation of a spec validator
 """
+
 import logging
 import os
 from collections.abc import Mapping
@@ -8,9 +9,9 @@ from io import BytesIO
 from numbers import Integral
 from numbers import Real
 from pathlib import Path
+from typing import IO
 from typing import Any
 from typing import Callable
-from typing import IO
 from typing import Optional
 from typing import Type
 
@@ -480,7 +481,7 @@ class SpecValidator:
         :return: HDU
         """
         new_hdu = fits.PrimaryHDU(data, header=fits.Header())
-        for (key, value) in validated_headers.items():
+        for key, value in validated_headers.items():
             new_hdu.header[key] = value
         for key in fits_cards:
             try:

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/exceptions.py

@@ -2,7 +2,6 @@
 Common Exceptions for the fits-validator
 """
 
-
 __all__ = [
     "ValidationException",
     "SpecSchemaDefinitionException",

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/spec_validators.py

@@ -1,6 +1,8 @@
 """
 Validators configured for specific Fits Specs
 """
+
+from dkist_fits_specifications.dataset_extras import load_processed_dataset_extra
 from dkist_fits_specifications.spec122 import load_processed_spec122
 from dkist_fits_specifications.spec214 import load_processed_spec214
 from dkist_fits_specifications.spec214.level0 import load_level0_spec214
@@ -52,3 +54,8 @@ spec214_validator = ProcessedSpecValidator(
     spec_processor_function=load_processed_spec214,
     SchemaValidationException=Spec214ValidationException,
 )
+
+spec_extras_validator = ProcessedSpecValidator(
+    spec_processor_function=load_processed_dataset_extra,
+    SchemaValidationException=SpecValidationException,
+)

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/tests/test_base_validator.py

@@ -1,6 +1,7 @@
 """
 Test for the base validator
 """
+
 from pathlib import Path
 
 import numpy as np

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/tests/test_spec214_validation+.py

@@ -379,7 +379,8 @@ def test_validate_formatted_compressed_header(tmp_path):
     When: Validating Headers
     Then: Do not raise an exception.
     """
-    from .conftest import BaseSpec214DatasetCaseSensitive, get_fits_object
+    from .conftest import BaseSpec214DatasetCaseSensitive
+    from .conftest import get_fits_object
 
     fits_file = get_fits_object(
         object_type="fits", tmpdir=tmp_path, ds=BaseSpec214DatasetCaseSensitive()

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/translator.py

@@ -1,8 +1,8 @@
 import logging
 from datetime import datetime
 from functools import reduce
-from typing import Any
 from typing import IO
+from typing import Any
 
 from astropy.io import fits
 from astropy.io.fits.hdu.hdulist import HDUList
@@ -105,7 +105,7 @@ def remove_spec_122_keys_and_spec_214_l0_keys(
     expanded_214 = load_processed_spec214(**dict(input_headers))
     all_214_keys = reduce(list.__add__, map(list, expanded_214.values()))
 
-    for keyword in header.keys():
+    for keyword in tuple(header.keys()):
         # Only remove the keys that are in spec 122 AND not in spec 214
         if (keyword in all_122_keys) and (keyword not in all_214_keys):
             header.remove(keyword)

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/version.py

@@ -5,4 +5,4 @@ try:
     from setuptools_scm import get_version
     __version__ = get_version(root='..', relative_to=__file__)
 except Exception:
-    __version__ = '5.2.0'
+    __version__ = '5.3.0'

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-header-validator
-Version: 5.2.0
+Version: 5.3.0
 Summary: DKIST data validator
 Home-page: https://bitbucket.org/dkistdc/dkist-header-validator/src/main/
 Author: NSO / AURA

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/docs/conf.py

@@ -1,6 +1,7 @@
 """
 Configuration file for the Sphinx documentation builder.
 """
+
 # -- stdlib imports ------------------------------------------------------------
 import importlib
 import sys

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/setup.cfg

@@ -56,6 +56,12 @@ omit = dkist_header_validator/tests/*
 console_scripts = 
 	dkist-header-validator = dkist_header_validator.api.validate:main
 
+[tool:isort]
+profile = black
+force_single_line = true
+combine_as_imports = false
+line_length = 100
+
 [egg_info]
 tag_build = 
 tag_date = 0

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/api/validate.py

@@ -1,9 +1,9 @@
 import typer
 
-from dkist_header_validator.spec_validators import spec122_validator
 from dkist_header_validator.spec_validators import Spec122ValidationException
-from dkist_header_validator.spec_validators import spec214_validator
 from dkist_header_validator.spec_validators import Spec214ValidationException
+from dkist_header_validator.spec_validators import spec122_validator
+from dkist_header_validator.spec_validators import spec214_validator
 
 app = typer.Typer(help="CLI for the dkist-header-validator package")
 """

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/tests/test_spec122_translation.py

@@ -6,8 +6,8 @@ from astropy.io import fits
 from astropy.io.fits.hdu.hdulist import HDUList
 
 from dkist_header_validator import ReturnTypeException
-from dkist_header_validator import spec122_validator
 from dkist_header_validator import Spec122ValidationException
+from dkist_header_validator import spec122_validator
 
 
 def test_translate_spec122_to_214_l0_base(valid_spec_122_object):

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/tests/test_spec122_validation-.py

@@ -4,8 +4,8 @@ from pathlib import Path
 import numpy as np
 import pytest
 
-from dkist_header_validator import spec122_validator
 from dkist_header_validator import Spec122ValidationException
+from dkist_header_validator import spec122_validator
 from dkist_header_validator.exceptions import ReturnTypeException
 from dkist_header_validator.exceptions import ValidationException
 

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/tests/test_spec214_validation-.py

@@ -4,9 +4,9 @@ from pathlib import Path
 import numpy as np
 import pytest
 
+from dkist_header_validator import Spec214ValidationException
 from dkist_header_validator import spec214_l0_validator
 from dkist_header_validator import spec214_validator
-from dkist_header_validator import Spec214ValidationException
 from dkist_header_validator.exceptions import ReturnTypeException
 from dkist_header_validator.exceptions import ValidationException
 

{dkist_header_validator-5.2.0 → dkist_header_validator-5.3.0}/dkist_header_validator/utils/expansions.py

@@ -1,6 +1,6 @@
 from dkist_fits_specifications.utils import schema_type_hint
-from dkist_fits_specifications.utils.spec_processors.expansion import expand_schema
 from dkist_fits_specifications.utils.spec_processors.expansion import ExpansionIndex
+from dkist_fits_specifications.utils.spec_processors.expansion import expand_schema
 
 
 def expand_naxis(naxis: int, schema: schema_type_hint) -> schema_type_hint: