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

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/.readthedocs.yml

@@ -1,8 +1,8 @@
 version: 2
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.13"
   apt_packages:
     - libopenjp2-7
     - graphviz

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

@@ -1,27 +1,30 @@
 Metadata-Version: 2.4
 Name: dkist-header-validator
-Version: 5.3.0
+Version: 5.4.0
 Summary: DKIST data validator
-Home-page: https://bitbucket.org/dkistdc/dkist-header-validator/src/main/
-Author: NSO / AURA
-Author-email: "aderks@nso.edu"
-License: MIT
+Author-email: NSO / AURA <dkistdc@nso.edu>
+License: BSD-3-Clause
+Project-URL: Homepage, https://nso.edu/dkist/data-center/
+Project-URL: Repository, https://bitbucket.org/dkistdc/dkist-header-validator
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portals
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
 Requires-Dist: astropy>=5.0
 Requires-Dist: voluptuous<1.0.0,>=0.11.7
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: dkist-fits-specifications>=4.1.0
+Requires-Dist: dkist-fits-specifications>=4.23.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-xdist; extra == "test"
 Requires-Dist: deepdiff; extra == "test"
 Requires-Dist: tox; extra == "test"
-Requires-Dist: dkist-data-simulator; extra == "test"
+Requires-Dist: dkist-data-simulator==5.8.0; extra == "test"
 Provides-Extra: cli
 Requires-Dist: typer; extra == "cli"
 Provides-Extra: docs

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/bitbucket-pipelines.yml

@@ -1,5 +1,5 @@
 # Build Configuration for python package deployment to pypi
-image: python:3.10
+image: python:3.13
 
 definitions:
   steps:
@@ -21,20 +21,43 @@ definitions:
         script:
           - ./ci_scripts/latest/execute_script.sh lint_python.sh
 
-    - step: &test
-        name: Test
+    - step: &scan
+        caches:
+          - pip
+        name: Scan
+        script:
+          - ./ci_scripts/latest/execute_script.sh scan_python.sh
+
+    - step: &test313
+        image: python:3.13
+        name: Test Python 3.13
+        caches:
+          - pip
         script:
           - pip install -U pip
-          - pip install .[test]
-          - pytest -v -n auto --cov dkist_header_validator --cov-report=xml --cov-report=term-missing
+          - pip install tox
+          - tox -e py313
           - ./ci_scripts/latest/execute_script.sh upload_coverage.sh
 
-    - step: &scan
+    - step: &test312
+        image: python:3.12
+        name: Test Python 3.12
         caches:
           - pip
-        name: Scan
         script:
-          - ./ci_scripts/latest/execute_script.sh scan_python.sh
+          - pip install -U pip
+          - pip install tox
+          - tox -e py312
+
+    - step: &test311
+        image: python:3.11
+        name: Test Python 3.11
+        caches:
+          - pip
+        script:
+          - pip install -U pip
+          - pip install tox
+          - tox -e py311
 
     - step: &docs
         name: Build Docs
@@ -55,7 +78,9 @@ pipelines:
     - step: *download_execute_script
     - step: *lint
     - parallel:
-        - step: *test
+        - step: *test313
+        - step: *test312
+        - step: *test311
         - step: *docs
         - step: *scan
   tags:
@@ -63,7 +88,9 @@ pipelines:
       - step: *download_execute_script
       - step: *lint
       - parallel:
-          - step: *test
-          - step: *docs
-          - step: *scan
+        - step: *test313
+        - step: *test312
+        - step: *test311
+        - step: *docs
+        - step: *scan
       - step: *publish

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

@@ -3,7 +3,6 @@ Definition of the base objects for the creation of a spec validator
 """
 
 import logging
-import os
 from collections.abc import Mapping
 from io import BytesIO
 from numbers import Integral
@@ -12,7 +11,6 @@ from pathlib import Path
 from typing import IO
 from typing import Any
 from typing import Callable
-from typing import Optional
 from typing import Type
 
 import astropy.time as t
@@ -23,6 +21,7 @@ from astropy.io import fits
 from astropy.io.fits.hdu.hdulist import HDUList
 from dkist_fits_specifications import spec214
 from dkist_fits_specifications.utils import schema_type_hint
+from numpy.typing import NDArray
 from voluptuous.error import Invalid
 
 from dkist_header_validator.exceptions import ReturnTypeException
@@ -40,7 +39,7 @@ __all__ = ["SpecValidator", "SpecSchema"]
 
 class FormatInvalid(Invalid):
     """
-    An value which does not match the schema format.
+    A value which does not match the schema format.
     """
 
 
@@ -425,7 +424,9 @@ class SpecValidator:
         return headers
 
     def _validate_headers(
-        self, input_headers: HDUList | dict | fits.header.Header, extra
+        self,
+        input_headers: HDUList | dict | fits.header.Header,
+        extra: bool,
     ) -> tuple[dict, dict]:
         """
         Validates open input headers against the instance spec_schema
@@ -446,17 +447,17 @@ class SpecValidator:
         verified_headers = self.verify_headers(headers, extra)
         return verified_headers, fits_cards
 
-    def _validate_file(self, input_headers: str | IO, extra) -> tuple[dict, dict, np.ndarray]:
+    def _validate_file(self, file: str | IO, extra: bool) -> tuple[dict, dict, np.ndarray]:
         """
         Validates files against the astropy and then instance spec_schema
-        :param input_headers: The input headers to validate in the following formats:
+        :param file: The input headers to validate in the following formats:
             - string file path
             - File like object
         :param extra: switch for validation to allow extra keys in schema
         :return: dictionary of verified headers to be used later
         """
         try:
-            with fits.open(input_headers) as hdul:
+            with fits.open(file) as hdul:
                 # verify fits headers with astropy verify library
                 hdul.verify("exception")
                 # normalize headers into a dict
@@ -471,7 +472,7 @@ class SpecValidator:
             raise ValidationException("Cannot parse headers", errors={type(exc): str(exc)})
 
     @staticmethod
-    def _return_HDU(validated_headers, data, fits_cards):
+    def _return_HDU(validated_headers: dict, data: NDArray, fits_cards: dict) -> fits.PrimaryHDU:
         """
         Returns validated headers as an HDU
         :param validated_headers: Already validated/translated headers to be written out
@@ -499,7 +500,7 @@ class SpecValidator:
         return new_hdu
 
     @classmethod
-    def _return_hdulist(cls, validated_headers, fits_cards) -> HDUList:
+    def _return_hdulist(cls, validated_headers: dict, fits_cards: dict) -> HDUList:
         """
         Returns validated headers as an HDUList
         :param validated_headers: Already validated/translated headers to be written out into
@@ -515,7 +516,7 @@ class SpecValidator:
         return new_hdu_list
 
     @staticmethod
-    def _return_dictionary(validated_headers, fits_cards) -> dict:
+    def _return_dictionary(validated_headers: dict, fits_cards: dict) -> dict:
         """
         Returns validated headers as a dictionary
         :param validated_headers: Already validated/translated headers to be written out into
@@ -528,60 +529,67 @@ class SpecValidator:
         return validated_headers
 
     @classmethod
-    def _return_BytesIO(cls, validated_headers, input_headers, data, fits_cards) -> BytesIO:
+    def _return_BytesIO(cls, validated_headers: dict, data: NDArray, fits_cards: dict) -> BytesIO:
         """
         Returns validated headers as a BytesIO object
         :param validated_headers: Already validated/translated headers to be written out into
           the BytesIO object
-        :param input_headers: original filepath or BytesIO object
         :param data: original data
         :param fits_cards: Any special cards to be included in the BytesIO object
         :return: BytesIO object
         """
         new_hdu = cls._return_HDU(validated_headers, data, fits_cards)
         new_hdu_list = fits.HDUList([new_hdu])
-        return BytesIO(
-            new_hdu_list.writeto(
-                str(os.path.basename(input_headers)),
-                overwrite=True,
-                output_verify="exception",
-                checksum=True,
-            )
+        buffer = BytesIO()
+        new_hdu_list.writeto(
+            buffer,
+            overwrite=True,
+            output_verify="exception",
+            checksum=True,
         )
+        return buffer
 
     @classmethod
-    def _return_file(cls, validated_headers, input_headers, data, fits_cards) -> (str, IO):
+    def _return_file(
+        cls, validated_headers: dict, file: str | Path, data: NDArray, fits_cards: dict
+    ) -> Path:
         """
-        Returns validated headers as a FITS file
+        Returns the path of validated headers written to a FITS file
         :param validated_headers: Already validated/translated headers to be written out
           into a FITS file
-        :param input_headers: original filepath or BytesIO object
+        :param file: original file path
         :param data: original data
         :param fits_cards: Any special cards to be included in the FITS file
-        :return: FITS file
+        :return: path to the FITS file
         """
         new_hdu = cls._return_HDU(validated_headers, data, fits_cards)
         new_hdu_list = fits.HDUList([new_hdu])
+        filepath = Path(file)
         new_hdu_list.writeto(
-            str(os.path.basename(input_headers)),
+            filepath,
             overwrite=True,
             output_verify="exception",
             checksum=True,
         )
-        return Path(os.path.basename(input_headers))
+        return filepath
 
     def _format_output(
-        self, return_type, validated_headers, input_headers=None, data=None, fits_cards=None
+        self,
+        return_type,
+        validated_headers: dict,
+        file: str | None = None,
+        data: NDArray | None = None,
+        fits_cards: dict | None = None,
     ):
         fits_cards = fits_cards or {}
         if return_type == Path:
             if data is None:
                 raise ReturnTypeException("No data. Cannot write file.")
-            return self._return_file(validated_headers, input_headers, data, fits_cards)
+            return self._return_file(validated_headers, file, data, fits_cards)
         if return_type == BytesIO:
             if data is None:
                 raise ReturnTypeException("No data. Cannot write BytesIO object.")
-            return self._return_BytesIO(validated_headers, input_headers, data, fits_cards)
+            return self._return_BytesIO(validated_headers, data, fits_cards)
         if return_type == dict:
             return self._return_dictionary(validated_headers, fits_cards)
         if return_type == HDUList:
@@ -593,7 +601,7 @@ class SpecValidator:
                 raise ReturnTypeException("No data. Cannot write PrimaryHDU.")
             return self._return_HDU(validated_headers, data, fits_cards)
 
-    def _capture_fits_cards(self, validated_headers) -> dict:
+    def _capture_fits_cards(self, validated_headers: dict) -> dict:
         """
         Pull special fits cards out of validated_headers dict.
         This is necessary for astropy header formatting.
@@ -647,13 +655,29 @@ class SpecValidator:
         ------
         dkist_header_validator.SpecValidationException or subclass
         """
-        if isinstance(input_headers, (dict, fits.header.Header, HDUList)):
-            validated_headers, fits_cards = self._validate_headers(input_headers, extra)
-            return self._format_output(
-                return_type, validated_headers, input_headers, None, fits_cards
-            )
-        validated_headers, fits_cards, data = self._validate_file(input_headers, extra)
-        return self._format_output(return_type, validated_headers, input_headers, data, fits_cards)
+        match input_headers:
+            case dict() | fits.header.Header() | HDUList():
+                validated_headers, fits_cards = self._validate_headers(
+                    input_headers=input_headers, extra=extra
+                )
+                return self._format_output(
+                    return_type=return_type,
+                    validated_headers=validated_headers,
+                    fits_cards=fits_cards,
+                )
+            case str() | Path() | BytesIO():
+                validated_headers, fits_cards, data = self._validate_file(
+                    file=input_headers, extra=extra
+                )
+                return self._format_output(
+                    return_type=return_type,
+                    validated_headers=validated_headers,
+                    file=input_headers,
+                    data=data,
+                    fits_cards=fits_cards,
+                )
+            case _:
+                raise ValidationException(f"{type(input_headers)} is not supported")
 
     def validate_and_translate_to_214_l0(self, input_headers, return_type=HDUList, extra=True):
         """
@@ -689,16 +713,31 @@ class SpecValidator:
         ------
         dkist_header_validator.SpecValidationException or subclass
         """
-        if isinstance(input_headers, (dict, fits.header.Header, HDUList)):
-            validated_headers, fits_cards = self._validate_headers(input_headers, extra)
-            translated_headers = translate_spec122_to_spec214_l0(validated_headers)
-            return self._format_output(return_type, translated_headers, None, None, fits_cards)
-        else:
-            validated_headers, fits_cards, data = self._validate_file(input_headers, extra)
-            translated_headers = translate_spec122_to_spec214_l0(validated_headers)
-            return self._format_output(
-                return_type, translated_headers, input_headers, data, fits_cards
-            )
+        match input_headers:
+            case dict() | fits.header.Header() | HDUList():
+                validated_headers, fits_cards = self._validate_headers(
+                    input_headers=input_headers, extra=extra
+                )
+                translated_headers = translate_spec122_to_spec214_l0(validated_headers)
+                return self._format_output(
+                    return_type=return_type,
+                    validated_headers=translated_headers,
+                    fits_cards=fits_cards,
+                )
+            case str() | Path() | BytesIO():
+                validated_headers, fits_cards, data = self._validate_file(
+                    file=input_headers, extra=extra
+                )
+                translated_headers = translate_spec122_to_spec214_l0(validated_headers)
+                return self._format_output(
+                    return_type=return_type,
+                    validated_headers=translated_headers,
+                    file=input_headers,
+                    data=data,
+                    fits_cards=fits_cards,
+                )
+            case _:
+                raise ValidationException(f"{type(input_headers)} is not supported")
 
 
 class ProcessedSpecValidator(SpecValidator):

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

@@ -16,6 +16,7 @@ __all__ = [
     "spec214_validator",
     "spec214_l0_validator",
     "Spec214ValidationException",
+    "spec_extras_validator",
 ]
 
 
@@ -39,6 +40,8 @@ spec122_validator = ProcessedSpecValidator(
 ############
 # SPEC-214 #
 ############
+
+
 class Spec214ValidationException(SpecValidationException):
     """
     Exception when validating a spec 214 file

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/dkist_header_validator/tests/conftest.py

@@ -6,6 +6,7 @@ import numpy as np
 import pytest
 from astropy.io import fits
 from astropy.wcs import WCS
+from dkist_data_simulator.dataset_extras import DatasetExtraBase
 from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_data_simulator.spec214 import Spec214Dataset
 from dkist_fits_specifications.spec122 import load_spec122
@@ -47,8 +48,10 @@ def get_fits_object(
     ]
     data = np.ones(shape=ds.array_shape)
     hdu = fits.PrimaryHDU(data=data)
+
     for key, value in header_dict.items():
-        hdu.header[key] = value
+        if key not in {"PCOUNT", "GCOUNT"}:
+            hdu.header[key] = value
 
     if object_type == "fits":
         file_name = tmpdir / f"{uuid4().hex}.fits"
@@ -244,10 +247,7 @@ class InvalidInstrumentTableSpec122Dataset(BaseSpec122Dataset):
         super().__init__(instrument=instrument)
 
         # Remove a random key from the instrument table
-        glob_name = instrument.lower().replace(
-            "-", ""
-        )  # For cryo and dl b/c the yamls don't have dashes
-        instrument_keys = load_spec122(glob=glob_name)[glob_name]
+        instrument_keys = load_spec122(glob=instrument)[instrument]
         removal_candidates = [k for k, v in instrument_keys.items() if "instrument_required" in v]
         removed_key = choice(removal_candidates)
         self.add_remove_key(removed_key)
@@ -401,10 +401,7 @@ class InvalidInstrumentTableSpec214l0Dataset(BaseSpec214l0Dataset):
         super().__init__(instrument=instrument)
 
         # Remove a random key from the instrument table
-        glob_name = instrument.lower().replace(
-            "-", ""
-        )  # For cryo and dl b/c the yamls don't have dashes
-        instrument_keys = load_level0_spec214(glob=glob_name)[glob_name]
+        instrument_keys = load_level0_spec214(glob=instrument)[instrument]
         removal_candidates = [k for k, v in instrument_keys.items() if "instrument_required" in v]
         removed_key = choice(removal_candidates)
         self.add_remove_key(removed_key)
@@ -623,10 +620,7 @@ class InvalidInstrumentTableSpec214Dataset(BaseSpec214Dataset):
         super().__init__(instrument=instrument)
 
         # Remove a random key from the instrument table
-        glob_name = instrument.lower().replace(
-            "-", ""
-        )  # For cryo and dl b/c the yamls don't have dashes
-        instrument_keys = load_spec214(glob=glob_name)[glob_name]
+        instrument_keys = load_spec214(glob=instrument)[instrument]
         removal_candidates = [k for k, v in instrument_keys.items() if "instrument_required" in v]
         removed_key = choice(removal_candidates)
         self.add_remove_key(removed_key)
@@ -637,3 +631,8 @@ class InvalidInstrumentTableSpec214Dataset(BaseSpec214Dataset):
 def invalid_instrument_table_spec_214_object(tmpdir, request, instrument):
     dataset = InvalidInstrumentTableSpec214Dataset(instrument)
     yield get_fits_object(object_type=request.param, tmpdir=tmpdir, ds=dataset), dataset.removed_key
+
+
+@pytest.fixture(scope="function", params=FITS_OBJECT_TYPES)
+def valid_dataset_extra_object(tmpdir, request):
+    yield get_fits_object(object_type=request.param, tmpdir=tmpdir, ds=DatasetExtraBase())

dkist_header_validator-5.4.0/dkist_header_validator/tests/test_dataset_extras_validation.py

@@ -0,0 +1,12 @@
+from dkist_header_validator import spec_extras_validator
+
+
+def test_dataset_extras(valid_dataset_extra_object):
+    """
+    Validates a fits header against the dataset extra schema
+    Given: A valid dataset extra fits header
+    When: Validating headers
+    Then: Do not raise an exception
+    """
+    # raises exception on failure
+    spec_extras_validator.validate(valid_dataset_extra_object, extra=False)

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

@@ -3,7 +3,6 @@ from pathlib import Path
 
 import pytest
 from astropy.io import fits
-from astropy.io.fits.hdu.hdulist import HDUList
 
 from dkist_header_validator import ReturnTypeException
 from dkist_header_validator import Spec122ValidationException

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

@@ -104,7 +104,7 @@ def test_toomanyHDUs_validate(valid_spec_122_too_many_HDUs):
         spec122_validator.validate(valid_spec_122_too_many_HDUs)
 
 
-@pytest.mark.parametrize("instrument", ["cryo-nirsp", "dlnirsp", "vbi", "visp", "vtf"])
+@pytest.mark.parametrize("instrument", ["cryonirsp", "dlnirsp", "vbi", "visp", "vtf"])
 def test_instrument_required_key_missing(invalid_instrument_table_spec_122_object):
     """
     Given: Headers from a specific instrument, but with one of the required header keys removed

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

@@ -93,7 +93,7 @@ def test_spec214_invalid_headers(invalid_spec_214_object):
         spec214_validator.validate(invalid_spec_214_object)
 
 
-@pytest.mark.parametrize("instrument", ["cryo-nirsp", "dlnirsp", "vbi", "visp", "vtf"])
+@pytest.mark.parametrize("instrument", ["cryonirsp", "dlnirsp", "vbi", "visp", "vtf"])
 def test_spec214l0_instrument_required_key_missing(invalid_instrument_table_spec_214l0_object):
     """
     Given: Headers from a specific instrument, but with one of the required header keys removed
@@ -197,7 +197,7 @@ def test_polarimetric_required_key_missing(invalid_polarimetric_spec_214_object)
         spec214_validator.validate(invalid_polarimetric_spec_214_object)
 
 
-@pytest.mark.parametrize("instrument", ["cryo-nirsp", "dlnirsp", "vbi", "visp", "vtf"])
+@pytest.mark.parametrize("instrument", ["cryonirsp", "dlnirsp", "vbi", "visp", "vtf"])
 def test_instrument_required_key_missing(invalid_instrument_table_spec_214_object):
     """
     Given: Headers from a specific instrument, but with one of the required header keys removed

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

@@ -1,27 +1,30 @@
 Metadata-Version: 2.4
 Name: dkist-header-validator
-Version: 5.3.0
+Version: 5.4.0
 Summary: DKIST data validator
-Home-page: https://bitbucket.org/dkistdc/dkist-header-validator/src/main/
-Author: NSO / AURA
-Author-email: "aderks@nso.edu"
-License: MIT
+Author-email: NSO / AURA <dkistdc@nso.edu>
+License: BSD-3-Clause
+Project-URL: Homepage, https://nso.edu/dkist/data-center/
+Project-URL: Repository, https://bitbucket.org/dkistdc/dkist-header-validator
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portals
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
 Requires-Dist: astropy>=5.0
 Requires-Dist: voluptuous<1.0.0,>=0.11.7
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: dkist-fits-specifications>=4.1.0
+Requires-Dist: dkist-fits-specifications>=4.23.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-xdist; extra == "test"
 Requires-Dist: deepdiff; extra == "test"
 Requires-Dist: tox; extra == "test"
-Requires-Dist: dkist-data-simulator; extra == "test"
+Requires-Dist: dkist-data-simulator==5.8.0; extra == "test"
 Provides-Extra: cli
 Requires-Dist: typer; extra == "cli"
 Provides-Extra: docs

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/dkist_header_validator.egg-info/SOURCES.txt

@@ -4,15 +4,13 @@
 .snyk
 README.rst
 bitbucket-pipelines.yml
-setup.cfg
-setup.py
+pyproject.toml
 tox.ini
 dkist_header_validator/__init__.py
 dkist_header_validator/base_validator.py
 dkist_header_validator/exceptions.py
 dkist_header_validator/spec_validators.py
 dkist_header_validator/translator.py
-dkist_header_validator/version.py
 dkist_header_validator.egg-info/PKG-INFO
 dkist_header_validator.egg-info/SOURCES.txt
 dkist_header_validator.egg-info/dependency_links.txt
@@ -24,6 +22,7 @@ dkist_header_validator/api/validate.py
 dkist_header_validator/tests/__init__.py
 dkist_header_validator/tests/conftest.py
 dkist_header_validator/tests/test_base_validator.py
+dkist_header_validator/tests/test_dataset_extras_validation.py
 dkist_header_validator/tests/test_spec122_translation.py
 dkist_header_validator/tests/test_spec122_validation+.py
 dkist_header_validator/tests/test_spec122_validation-.py

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/dkist_header_validator.egg-info/requires.txt

@@ -1,7 +1,7 @@
 astropy>=5.0
 voluptuous<1.0.0,>=0.11.7
 pyyaml>=6.0
-dkist-fits-specifications>=4.1.0
+dkist-fits-specifications>=4.23.0
 
 [cli]
 typer
@@ -21,4 +21,4 @@ pytest-cov
 pytest-xdist
 deepdiff
 tox
-dkist-data-simulator
+dkist-data-simulator==5.8.0

dkist_header_validator-5.4.0/dkist_header_validator.egg-info/top_level.txt

@@ -0,0 +1,4 @@
+ci_scripts
+dkist_header_validator
+docs
+wheelhouse

dkist_header_validator-5.4.0/pyproject.toml

@@ -0,0 +1,76 @@
+[build-system]
+requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "build"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+exclude = ["build*"]
+
+[tool.setuptools_scm]
+
+[tool.dkist-dev-tools]
+
+[project]
+dynamic = ["version"]
+name = "dkist-header-validator"
+requires-python = ">=3.11"
+description = "DKIST data validator"
+readme = "README.rst"
+authors = [ {name = "NSO / AURA", email = "dkistdc@nso.edu"} ]
+license = {text = "BSD-3-Clause"}
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+  "astropy >= 5.0",
+  "voluptuous >=0.11.7, < 1.0.0",
+  "pyyaml >=6.0",
+  "dkist-fits-specifications >= 4.23.0",
+]
+[project.urls]
+Homepage = "https://nso.edu/dkist/data-center/"
+Repository = "https://bitbucket.org/dkistdc/dkist-header-validator"
+Help = "https://nso.atlassian.net/servicedesk/customer/portals"
+
+[project.optional-dependencies]
+test = [
+  "pytest",
+  "pytest-cov",
+  "pytest-xdist",
+  "deepdiff",
+  "tox",
+  "dkist-data-simulator == 5.8.0",
+]
+cli = [
+  "typer",
+]
+docs = [
+  "sphinx",
+  "sphinx-astropy",
+  "sphinx-changelog",
+  "sphinx-autoapi",
+  "pytest",
+  "towncrier",
+  "dkist-sphinx-theme",
+]
+
+[tool.coverage.run]
+omit = [
+    "dkist_header_validator/tests/*",
+    "dkist_header_validator/__init__.py",
+]
+
+[tool.black]
+line-length = 100
+
+[tool.isort]
+profile = "black"
+force_single_line = true
+combine_as_imports = false
+line_length = 100
+
+[project.scripts]
+dkist-header-validator = "dkist_header_validator.api.validate:main"

dkist_header_validator-5.4.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{dkist_header_validator-5.3.0 → dkist_header_validator-5.4.0}/tox.ini

@@ -1,21 +1,19 @@
 [tox]
 envlist =
-    py{38,39}-test
-    build_docs
-    codestyle
+    py{311,312,313}-test
 isolated_build = true
 # This is included for testing of the template. You can remove it safely.
-skip_missing_interpreters = True
+skip_missing_interpreters = false
 
 [testenv]
-# Pass through the following environemnt variables which may be needed for the CI
+# Pass through the following environment variables which may be needed for the CI
 passenv = HOME, WINDIR, LC_ALL, LC_CTYPE, CC, CI, TRAVIS
 
 # Run the tests in a temporary directory to make sure that we don't import
 # the package from the source tree
 changedir = .tmp/{envname}
 
-# tox environments are constructued with so-called 'factors' (or terms)
+# tox environments are constructed with so-called 'factors' (or terms)
 # separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor:
 # will only take effect if that factor is included in the environment name. To
 # see a list of example environments that can be run, along with a description,
@@ -29,16 +27,7 @@ description =
 # The following indicates which extras_require from setup.cfg will be installed
 extras =
     test
-    alldeps: all
 
 commands =
     pip freeze
-    pytest --pyargs dkist_header_validator {toxinidir}/docs --cov dkist_header_validator --cov-config={toxinidir}/setup.cfg {posargs}
-
-[testenv:build_docs]
-changedir = docs
-description = invoke sphinx-build to build the HTML docs
-extras = docs
-commands =
-    pip freeze
-    sphinx-build -W -b html . _build/html {posargs}
+    pytest -n auto --pyargs dkist_header_validator {toxinidir}/docs --cov dkist_header_validator --cov-config={toxinidir}/pyproject.toml {posargs}

dkist_header_validator-5.3.0/dkist_header_validator/version.py

@@ -1,8 +0,0 @@
-# Note that we need to fall back to the hard-coded version if either
-# setuptools_scm can't be imported or setuptools_scm can't determine the
-# version, so we catch the generic 'Exception'.
-try:
-    from setuptools_scm import get_version
-    __version__ = get_version(root='..', relative_to=__file__)
-except Exception:
-    __version__ = '5.3.0'

dkist_header_validator-5.3.0/dkist_header_validator.egg-info/top_level.txt

@@ -1 +0,0 @@
-dkist_header_validator

dkist_header_validator-5.3.0/setup.cfg

@@ -1,68 +0,0 @@
-[metadata]
-name = dkist-header-validator
-description = DKIST data validator
-long_description = file: README.rst
-author = NSO / AURA
-author_email = "aderks@nso.edu"
-license = MIT
-url = https://bitbucket.org/dkistdc/dkist-header-validator/src/main/
-edit_on_github = False
-classifiers = 
-	Programming Language :: Python
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.10
-	Programming Language :: Python :: 3.11
-
-[options]
-python_requires = >=3.10
-setup_requires = setuptools_scm
-packages = find:
-include_package_data = True
-install_requires = 
-	astropy >= 5.0
-	voluptuous >=0.11.7, < 1.0.0
-	pyyaml >=6.0
-	dkist-fits-specifications >= 4.1.0
-
-[options.extras_require]
-test = 
-	pytest
-	pytest-cov
-	pytest-xdist
-	deepdiff
-	tox
-	dkist-data-simulator
-cli = 
-	typer
-docs = 
-	sphinx
-	sphinx-astropy
-	sphinx-changelog
-	sphinx-autoapi
-	pytest
-	towncrier
-	dkist-sphinx-theme
-
-[tool:pytest]
-minversion = 3.0
-testpaths = "dkist_header_validator/tests"
-norecursedirs = ".tox" "build" "docs[\/]_build" "docs[\/]generated" "*.egg-info" "examples"
-
-[coverage:run]
-source = dkist_header_validator/
-omit = dkist_header_validator/tests/*
-
-[options.entry_points]
-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.3.0/setup.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-import os
-
-from setuptools import setup
-
-VERSION_TEMPLATE = """
-# Note that we need to fall back to the hard-coded version if either
-# setuptools_scm can't be imported or setuptools_scm can't determine the
-# version, so we catch the generic 'Exception'.
-try:
-    from setuptools_scm import get_version
-    __version__ = get_version(root='..', relative_to=__file__)
-except Exception:
-    __version__ = '{version}'
-""".lstrip()
-
-setup(
-    use_scm_version={
-        "write_to": os.path.join("dkist_header_validator", "version.py"),
-        "write_to_template": VERSION_TEMPLATE,
-    },
-)