dkist-processing-cryonirsp 0.0.63__tar.gz → 0.0.64rc1__tar.gz

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist_processing_cryonirsp
-Version: 0.0.63
+Version: 0.0.64rc1
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA

dkist_processing_cryonirsp-0.0.64rc1/changelog/127.misc.rst

@@ -0,0 +1 @@
+Resolve matplotlib version conflict

dkist_processing_cryonirsp-0.0.64rc1/changelog/128.misc.rst

@@ -0,0 +1 @@
+Upgrade the version of dkist-processing-common which brings along various major version upgrades to libraries associated with Pydantic 2.

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/__init__.py

@@ -1,5 +1,5 @@
 """Init."""
-from dkist_service_configuration import logger  # first import to set logging.BasicConfig
+from dkist_service_configuration.logging import logger  # first import to set logging.BasicConfig
 from pkg_resources import DistributionNotFound
 from pkg_resources import get_distribution
 

dkist_processing_cryonirsp-0.0.64rc1/dkist_processing_cryonirsp/config.py

@@ -0,0 +1,12 @@
+"""Configuration for the dkist-processing-cryonirsp package and the logging thereof."""
+from dkist_processing_common.config import DKISTProcessingCommonConfiguration
+
+
+class DKISTProcessingCryoNIRSPConfigurations(DKISTProcessingCommonConfiguration):
+    """Configurations custom to the dkist-processing-cryonirsp package."""
+
+    pass  # nothing custom yet
+
+
+dkist_processing_cryonirsp_configurations = DKISTProcessingCryoNIRSPConfigurations()
+dkist_processing_cryonirsp_configurations.log_configurations()

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/assemble_movie.py

@@ -2,7 +2,7 @@
 import numpy as np
 from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.tasks import AssembleMovie
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 from PIL import ImageDraw
 from PIL.ImageFont import FreeTypeFont
 

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/bad_pixel_map.py

@@ -2,7 +2,7 @@
 import numpy as np
 import scipy.ndimage as spnd
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/beam_boundaries_base.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 
 import numpy as np
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 from largestinteriorrectangle import lir
 from skimage import filters
 from skimage.exposure import rescale_intensity

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/ci_beam_boundaries.py

@@ -1,7 +1,7 @@
 """Cryonirsp CI beam boundaries task."""
 import largestinteriorrectangle as lir
 import numpy as np
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.tasks.beam_boundaries_base import BeamBoundariesCalibrationBase
 from dkist_processing_cryonirsp.tasks.beam_boundaries_base import BeamBoundary

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/ci_science.py

@@ -1,7 +1,7 @@
 """Cryonirsp CI science calibration task."""
 from collections import defaultdict
 
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/dark.py

@@ -1,7 +1,7 @@
 """CryoNIRSP dark calibration task."""
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/gain.py

@@ -6,7 +6,7 @@ import numpy as np
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_math.arithmetic import subtract_array_from_arrays
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/instrument_polarization.py

@@ -13,7 +13,7 @@ from dkist_processing_math.transform.binning import resize_arrays
 from dkist_processing_pac.fitter.polcal_fitter import PolcalFitter
 from dkist_processing_pac.input_data.drawer import Drawer
 from dkist_processing_pac.input_data.dresser import Dresser
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/linearity_correction.py

@@ -7,7 +7,7 @@ from astropy.io import fits
 from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 from numba import njit
 from numba import prange
 

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/make_movie_frames.py

@@ -7,7 +7,7 @@ from astropy.io import fits
 from astropy.visualization import ZScaleInterval
 from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.parsers.cryonirsp_l1_fits_access import CryonirspL1FitsAccess

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/mixin/intermediate_frame.py

@@ -6,7 +6,7 @@ import numpy as np
 from astropy.io import fits
 from dkist_processing_common.codecs.fits import fits_hdu_decoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/mixin/shift_measurements.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 
 import numpy as np
 import skimage.registration as skir
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 SPATIAL = "SPATIAL"
 SPECTRAL = "SPECTRAL"

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/quality_metrics.py

@@ -9,7 +9,7 @@ from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.parsers.quality import L1QualityFitsAccess
 from dkist_processing_common.tasks import QualityL0Metrics
 from dkist_processing_common.tasks.mixin.quality import QualityMixin
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspConstants
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/science_base.py

@@ -14,7 +14,7 @@ from dkist_processing_math.arithmetic import divide_arrays_by_array
 from dkist_processing_math.arithmetic import subtract_array_from_arrays
 from dkist_processing_math.statistics import average_numpy_arrays
 from dkist_processing_pac.optics.telescope import Telescope
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/sp_beam_boundaries.py

@@ -2,7 +2,7 @@
 import math
 
 import numpy as np
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.tasks.beam_boundaries_base import BeamBoundariesCalibrationBase
 from dkist_processing_cryonirsp.tasks.beam_boundaries_base import BeamBoundary

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/sp_geometric.py

@@ -8,7 +8,7 @@ from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_math.arithmetic import divide_arrays_by_array
 from dkist_processing_math.arithmetic import subtract_array_from_arrays
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 from scipy.optimize import minimize
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/sp_science.py

@@ -4,7 +4,7 @@ from collections import defaultdict
 import numpy as np
 from astropy.io import fits
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/sp_solar_gain.py

@@ -5,7 +5,7 @@ from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_math.arithmetic import divide_arrays_by_array
 from dkist_processing_math.arithmetic import subtract_array_from_arrays
 from dkist_processing_math.statistics import average_numpy_arrays
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 from scipy import signal
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tasks/write_l1.py

@@ -9,7 +9,7 @@ import numpy as np
 from astropy.io import fits
 from dkist_processing_common.models.wavelength import WavelengthRange
 from dkist_processing_common.tasks import WriteL1Frame
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspConstants
 

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tests/local_trial_workflows/l0_cals_only.py

@@ -9,7 +9,7 @@ from astropy.io import fits
 from dkist_processing_common.manual import ManualProcessing
 from dkist_processing_common.models.constants import BudName
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -11,7 +11,7 @@ from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import WorkflowTaskBase
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -11,7 +11,7 @@ from dkist_header_validator import spec122_validator
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tests/test_bad_pixel_maps.py

@@ -7,7 +7,7 @@ from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.tests.conftest import FakeGQLClient
-from dkist_service_configuration import logger
+from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.bad_pixel_map import BadPixelMapCalibration

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp/tests/test_trial_output_data.py

@@ -8,7 +8,7 @@ from dkist_processing_common.codecs.quality import quality_data_encoder
 from dkist_processing_common.codecs.str import str_encoder
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tests.conftest import FakeGQLClient
-from pydantic.dataclasses import dataclass as validating_dataclass
+from pydantic import BaseModel
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
@@ -144,8 +144,7 @@ def write_unused_frames_to_task(task: TransferCryoTrialData) -> int:
     return 1
 
 
-@validating_dataclass
-class AvailableOutputFiles:
+class AvailableOutputFiles(BaseModel):
     """Number of files of each type available for potential output"""
 
     num_debug: int

dkist_processing_cryonirsp-0.0.64rc1/dkist_processing_cryonirsp/workflows/__init__.py

@@ -0,0 +1,2 @@
+"""Workflow package."""
+from dkist_processing_cryonirsp.config import dkist_processing_cryonirsp_configurations

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 0.0.63
+Version: 0.0.64rc1
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp.egg-info/SOURCES.txt

@@ -12,7 +12,10 @@ setup.cfg
 setup.py
 towncrier_science.toml
 changelog/.gitempty
+changelog/127.misc.rst
+changelog/128.misc.rst
 dkist_processing_cryonirsp/__init__.py
+dkist_processing_cryonirsp/config.py
 dkist_processing_cryonirsp.egg-info/PKG-INFO
 dkist_processing_cryonirsp.egg-info/SOURCES.txt
 dkist_processing_cryonirsp.egg-info/dependency_links.txt

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/dkist_processing_cryonirsp.egg-info/requires.txt

@@ -2,12 +2,12 @@ Pillow==10.2.0
 astropy==5.3.2
 dkist-fits-specifications==4.2.0
 dkist-header-validator==5.1.0
-dkist-processing-common==6.2.4
+dkist-processing-common==7.0.0rc2
 dkist-processing-math==2.0.0
 dkist-processing-pac==3.0.1
-dkist-spectral-lines==2.0.0
+dkist-spectral-lines==3.0.0
 largestinteriorrectangle==0.2.0
-dkist-service-configuration==1.1.0
+dkist-service-configuration==2.2
 moviepy==1.0.3
 numba==0.57.1
 numpy==1.24.4
@@ -39,7 +39,7 @@ dkist-processing-common[inventory]
 dkist-inventory==1.3.1
 
 [quality]
-dkist-quality==1.0.1
+dkist-quality==1.0.4
 
 [test]
 pytest
@@ -53,4 +53,4 @@ dkist-processing-common[inventory]
 dkist-inventory==1.3.1
 dkist-processing-common[asdf]
 dkist-inventory[asdf]==1.3.1
-dkist-quality==1.0.1
+dkist-quality==1.0.4

{dkist_processing_cryonirsp-0.0.63 → dkist_processing_cryonirsp-0.0.64rc1}/setup.cfg

@@ -21,12 +21,12 @@ install_requires =
 	astropy == 5.3.2
 	dkist-fits-specifications == 4.2.0
 	dkist-header-validator == 5.1.0
-	dkist-processing-common == 6.2.4
+	dkist-processing-common == 7.0.0rc2
 	dkist-processing-math == 2.0.0
 	dkist-processing-pac == 3.0.1
-	dkist-spectral-lines == 2.0.0
+	dkist-spectral-lines == 3.0.0
 	largestinteriorrectangle == 0.2.0
-	dkist-service-configuration == 1.1.0
+	dkist-service-configuration == 2.2
 	moviepy == 1.0.3
 	numba == 0.57.1
 	numpy == 1.24.4
@@ -54,7 +54,7 @@ asdf =
 	dkist-processing-common[asdf]
 	dkist-inventory[asdf]==1.3.1
 quality = 
-	dkist-quality==1.0.1
+	dkist-quality==1.0.4
 grogu = 
 	dkist
 	pyparsing

dkist_processing_cryonirsp-0.0.63/dkist_processing_cryonirsp/workflows/__init__.py

@@ -1,9 +0,0 @@
-"""Init."""
-from pkg_resources import DistributionNotFound
-from pkg_resources import get_distribution
-
-try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
-    # package is not installed
-    __version__ = "unknown"