dkist-processing-cryonirsp 1.3.3__tar.gz → 1.3.5__tar.gz

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/CHANGELOG.rst

@@ -1,3 +1,22 @@
+v1.3.5 (2024-10-15)
+===================
+
+Misc
+----
+
+- Bump `dkist-processing-common` to v10.3.0 and `dkist-processing-pac` to v3.1.0, both of which harden polcal fitting against bad input data. (`#157 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/157>`__)
+
+
+v1.3.4 (2024-10-14)
+===================
+
+Misc
+----
+
+- Make and publish wheels at code push in build pipeline (`#156 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/156>`__)
+- Switch from setup.cfg to pyproject.toml for build configuration (`#156 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/156>`__)
+
+
 v1.3.3 (2024-10-07)
 ===================
 

{dkist_processing_cryonirsp-1.3.3/dkist_processing_cryonirsp.egg-info → dkist_processing_cryonirsp-1.3.5}/PKG-INFO

@@ -1,21 +1,66 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 1.3.3
+Version: 1.3.5
 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
-Author-email: "dkistdc@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-processing-cryonirsp/
+Project-URL: Documentation, https://docs.dkist.nso.edu/projects/cryo-nirsp
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portal/5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: Pillow==10.3.0
+Requires-Dist: astropy==6.1.0
+Requires-Dist: dkist-fits-specifications==4.7.0
+Requires-Dist: dkist-header-validator==5.1.1
+Requires-Dist: dkist-processing-common==10.3.0
+Requires-Dist: dkist-processing-math==2.1.1
+Requires-Dist: dkist-processing-pac==3.1.0
+Requires-Dist: dkist-spectral-lines==3.0.0
+Requires-Dist: largestinteriorrectangle==0.2.0
+Requires-Dist: dkist-service-configuration==2.2
+Requires-Dist: moviepy==1.0.3
+Requires-Dist: numba==0.59.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: peakutils==1.3.4
+Requires-Dist: scikit-image==0.23.2
+Requires-Dist: scipy==1.13.1
+Requires-Dist: sunpy==5.1.3
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: towncrier; extra == "test"
+Requires-Dist: dkist-data-simulator>=5.2.0; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[inventory]; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[asdf]; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[quality]; extra == "test"
 Provides-Extra: inventory
+Requires-Dist: dkist-processing-common[inventory]; extra == "inventory"
+Requires-Dist: dkist-inventory==1.4.0; extra == "inventory"
 Provides-Extra: asdf
+Requires-Dist: dkist-processing-common[asdf]; extra == "asdf"
+Requires-Dist: dkist-inventory[asdf]==1.4.0; extra == "asdf"
 Provides-Extra: quality
+Requires-Dist: dkist-quality==1.1.1; extra == "quality"
 Provides-Extra: grogu
+Requires-Dist: dkist; extra == "grogu"
+Requires-Dist: pyparsing; extra == "grogu"
+Requires-Dist: dkist-inventory>=1.4.0; extra == "grogu"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-astropy; extra == "docs"
+Requires-Dist: sphinx-changelog; extra == "docs"
+Requires-Dist: sphinx-autoapi; extra == "docs"
+Requires-Dist: pytest; extra == "docs"
+Requires-Dist: towncrier; extra == "docs"
+Requires-Dist: dkist-sphinx-theme; extra == "docs"
 
 dkist-processing-cryonirsp
 ==========================

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/bitbucket-pipelines.yml

@@ -75,9 +75,9 @@ definitions:
         name: Push Code
         script:
           - pip install -U pip
-          - python setup.py sdist
-          - pip install twine
-          - twine upload dist/*
+          - pip install build twine
+          - python -m build --outdir wheelhouse .
+          - python -m twine upload --skip-existing wheelhouse/*
     - step: &push_mpw
         caches:
           - pip

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/dkist_processing_cryonirsp/tests/test_assemble_qualilty.py

@@ -232,6 +232,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
                 },
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "num_varied_I_sys": 2,
             },
             ["QUALITY_POLCAL_LOCAL_PAR_VALS", "QUALITY_TASK_CI BEAM 1"],
@@ -240,6 +241,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
             {
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "red_chi_list": [1, 2, 3],
                 "residual_json": dataframe_json,
             },
@@ -249,6 +251,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
             {
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "efficiency_list": ((np.random.randn(4, 100) - 0.5) * 0.3).tolist(),
                 "warnings": ["A warning"],
             },

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/dkist_processing_cryonirsp/tests/test_instrument_polarization.py

@@ -43,13 +43,14 @@ class DummyPolcalFitter(PolcalFitter):
         **fit_kwargs,
     ):
         with patch("dkist_processing_pac.fitter.polcal_fitter.FitObjects"):
-            super().__init__(
-                local_dresser=local_dresser,
-                global_dresser=global_dresser,
-                fit_mode="use_M12_I_sys_per_step",
-                init_set="OCCal_VIS",
-                _dont_fit=True,
-            )
+            with patch("dkist_processing_pac.fitter.polcal_fitter.PolcalFitter.check_dressers"):
+                super().__init__(
+                    local_dresser=local_dresser,
+                    global_dresser=global_dresser,
+                    fit_mode="use_M12_I_sys_per_step",
+                    init_set="OCCal_VIS",
+                    _dont_fit=True,
+                )
 
         self.num_modstates = local_dresser.nummod
 

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5/dkist_processing_cryonirsp.egg-info}/PKG-INFO

@@ -1,21 +1,66 @@
 Metadata-Version: 2.1
-Name: dkist_processing_cryonirsp
-Version: 1.3.3
+Name: dkist-processing-cryonirsp
+Version: 1.3.5
 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
-Author-email: "dkistdc@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-processing-cryonirsp/
+Project-URL: Documentation, https://docs.dkist.nso.edu/projects/cryo-nirsp
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portal/5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: Pillow==10.3.0
+Requires-Dist: astropy==6.1.0
+Requires-Dist: dkist-fits-specifications==4.7.0
+Requires-Dist: dkist-header-validator==5.1.1
+Requires-Dist: dkist-processing-common==10.3.0
+Requires-Dist: dkist-processing-math==2.1.1
+Requires-Dist: dkist-processing-pac==3.1.0
+Requires-Dist: dkist-spectral-lines==3.0.0
+Requires-Dist: largestinteriorrectangle==0.2.0
+Requires-Dist: dkist-service-configuration==2.2
+Requires-Dist: moviepy==1.0.3
+Requires-Dist: numba==0.59.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: peakutils==1.3.4
+Requires-Dist: scikit-image==0.23.2
+Requires-Dist: scipy==1.13.1
+Requires-Dist: sunpy==5.1.3
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: towncrier; extra == "test"
+Requires-Dist: dkist-data-simulator>=5.2.0; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[inventory]; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[asdf]; extra == "test"
+Requires-Dist: dkist-processing-cryonirsp[quality]; extra == "test"
 Provides-Extra: inventory
+Requires-Dist: dkist-processing-common[inventory]; extra == "inventory"
+Requires-Dist: dkist-inventory==1.4.0; extra == "inventory"
 Provides-Extra: asdf
+Requires-Dist: dkist-processing-common[asdf]; extra == "asdf"
+Requires-Dist: dkist-inventory[asdf]==1.4.0; extra == "asdf"
 Provides-Extra: quality
+Requires-Dist: dkist-quality==1.1.1; extra == "quality"
 Provides-Extra: grogu
+Requires-Dist: dkist; extra == "grogu"
+Requires-Dist: pyparsing; extra == "grogu"
+Requires-Dist: dkist-inventory>=1.4.0; extra == "grogu"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-astropy; extra == "docs"
+Requires-Dist: sphinx-changelog; extra == "docs"
+Requires-Dist: sphinx-autoapi; extra == "docs"
+Requires-Dist: pytest; extra == "docs"
+Requires-Dist: towncrier; extra == "docs"
+Requires-Dist: dkist-sphinx-theme; extra == "docs"
 
 dkist-processing-cryonirsp
 ==========================

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/dkist_processing_cryonirsp.egg-info/SOURCES.txt

@@ -8,8 +8,6 @@ bitbucket-pipelines.yml
 check_changelog_updated.sh
 pyproject.toml
 science_towncrier.sh
-setup.cfg
-setup.py
 towncrier_science.toml
 changelog/.gitempty
 dkist_processing_cryonirsp/__init__.py

{dkist_processing_cryonirsp-1.3.3 → dkist_processing_cryonirsp-1.3.5}/dkist_processing_cryonirsp.egg-info/requires.txt

@@ -2,9 +2,9 @@ Pillow==10.3.0
 astropy==6.1.0
 dkist-fits-specifications==4.7.0
 dkist-header-validator==5.1.1
-dkist-processing-common==10.2.1
-dkist-processing-math==2.1.0
-dkist-processing-pac==3.0.2
+dkist-processing-common==10.3.0
+dkist-processing-math==2.1.1
+dkist-processing-pac==3.1.0
 dkist-spectral-lines==3.0.0
 largestinteriorrectangle==0.2.0
 dkist-service-configuration==2.2
@@ -49,8 +49,6 @@ pytest-mock
 hypothesis
 towncrier
 dkist-data-simulator>=5.2.0
-dkist-processing-common[inventory]
-dkist-inventory==1.4.0
-dkist-processing-common[asdf]
-dkist-inventory[asdf]==1.4.0
-dkist-quality==1.1.1
+dkist-processing-cryonirsp[inventory]
+dkist-processing-cryonirsp[asdf]
+dkist-processing-cryonirsp[quality]

dkist_processing_cryonirsp-1.3.5/dkist_processing_cryonirsp.egg-info/top_level.txt

@@ -0,0 +1,5 @@
+changelog
+dkist_processing_cryonirsp
+docs
+licenses
+wheelhouse

dkist_processing_cryonirsp-1.3.5/pyproject.toml

@@ -0,0 +1,133 @@
+[build-system]
+requires = ["setuptools>=64", "setuptools_scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.setuptools_scm]
+
+[project]
+dynamic = ["version"]
+name = "dkist-processing-cryonirsp"
+requires-python = ">=3.11"
+description = "Science processing code for the Cryo-NIRSP instrument on DKIST"
+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",
+]
+dependencies = [
+  "Pillow == 10.3.0",
+  "astropy == 6.1.0",
+  "dkist-fits-specifications == 4.7.0",
+  "dkist-header-validator == 5.1.1",
+  "dkist-processing-common == 10.3.0",
+  "dkist-processing-math == 2.1.1",
+  "dkist-processing-pac == 3.1.0",
+  "dkist-spectral-lines == 3.0.0",
+  "largestinteriorrectangle == 0.2.0",
+  "dkist-service-configuration == 2.2",
+  "moviepy == 1.0.3",
+  "numba == 0.59.1",
+  "numpy == 1.26.4",
+  "peakutils == 1.3.4",
+  "scikit-image == 0.23.2",
+  "scipy == 1.13.1",
+  "sunpy == 5.1.3",
+]
+
+[project.urls]
+Homepage = "https://nso.edu/dkist/data-center/"
+Repository = "https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/"
+Documentation = "https://docs.dkist.nso.edu/projects/cryo-nirsp"
+Help = "https://nso.atlassian.net/servicedesk/customer/portal/5"
+
+[project.optional-dependencies]
+test = [
+  "pytest",
+  "pytest-cov",
+  "pytest-xdist",
+  "pytest-mock",
+  "hypothesis",
+  "towncrier",
+  "dkist-data-simulator >= 5.2.0",
+  "dkist-processing-cryonirsp[inventory]",
+  "dkist-processing-cryonirsp[asdf]",
+  "dkist-processing-cryonirsp[quality]",
+]
+inventory = [
+  "dkist-processing-common[inventory]",
+  "dkist-inventory==1.4.0",
+]
+asdf = [
+  "dkist-processing-common[asdf]",
+  "dkist-inventory[asdf]==1.4.0",
+]
+quality = [
+  "dkist-quality==1.1.1",
+]
+grogu = [
+  "dkist",
+  "pyparsing",
+  "dkist-inventory >= 1.4.0",
+]
+docs = [
+  "sphinx",
+  "sphinx-astropy",
+  "sphinx-changelog",
+  "sphinx-autoapi",
+  "pytest",
+  "towncrier",
+  "dkist-sphinx-theme",
+]
+
+[tool.pytest.ini_options]
+markers = [
+  "development: For tests that can only be run while developing with a sidecar proxy (as opposed to in bitbucket pipelines)"
+]
+
+[tool.coverage.run]
+omit = [
+    "dkist_processing_cryonirsp/tests/*",
+    "dkist_processing_cryonirsp/__init__.py",
+]
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.towncrier]
+    package = "dkist_processing_cryonirsp"
+    filename = "CHANGELOG.rst"
+    directory = "changelog/"
+    issue_format = "`#{issue} <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/{issue}>`__"
+    title_format = "{version} ({project_date})"
+    ignore = [".gitempty", "*.science.rst"]
+
+[[tool.towncrier.type]]
+      directory = "feature"
+      name = "Features"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "bugfix"
+      name = "Bugfixes"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "removal"
+      name = "Removals"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "misc"
+      name = "Misc"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "doc"
+      name = "Documentation"
+      showcontent = true

dkist_processing_cryonirsp-1.3.5/setup.cfg

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

dkist_processing_cryonirsp-1.3.3/dkist_processing_cryonirsp.egg-info/top_level.txt

@@ -1 +0,0 @@
-dkist_processing_cryonirsp

dkist_processing_cryonirsp-1.3.3/pyproject.toml

@@ -1,32 +0,0 @@
-[tool.towncrier]
-    package = "dkist_processing_cryonirsp"
-    filename = "CHANGELOG.rst"
-    directory = "changelog/"
-    issue_format = "`#{issue} <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/{issue}>`__"
-    title_format = "{version} ({project_date})"
-    ignore = [".gitempty"]
-
-[[tool.towncrier.type]]
-      directory = "feature"
-      name = "Features"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "bugfix"
-      name = "Bugfixes"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "removal"
-      name = "Removals"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "misc"
-      name = "Misc"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "doc"
-      name = "Documentation"
-      showcontent = true

dkist_processing_cryonirsp-1.3.3/setup.cfg

@@ -1,83 +0,0 @@
-[metadata]
-name = dkist_processing_cryonirsp
-description = Science processing code for the Cryo-NIRSP instrument on DKIST
-long_description = file: README.rst
-author = NSO / AURA
-author_email = "dkistdc@nso.edu"
-license = MIT
-url = https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
-classifiers = 
-	Programming Language :: Python
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.11
-
-[options]
-python_requires = >=3.11
-setup_requires = setuptools_scm
-packages = find:
-include_package_data = True
-install_requires = 
-	Pillow == 10.3.0
-	astropy == 6.1.0
-	dkist-fits-specifications == 4.7.0
-	dkist-header-validator == 5.1.1
-	dkist-processing-common == 10.2.1
-	dkist-processing-math == 2.1.0
-	dkist-processing-pac == 3.0.2
-	dkist-spectral-lines == 3.0.0
-	largestinteriorrectangle == 0.2.0
-	dkist-service-configuration == 2.2
-	moviepy == 1.0.3
-	numba == 0.59.1
-	numpy == 1.26.4
-	peakutils == 1.3.4
-	scikit-image == 0.23.2
-	scipy == 1.13.1
-	sunpy == 5.1.3
-
-[options.extras_require]
-test = 
-	pytest
-	pytest-cov
-	pytest-xdist
-	pytest-mock
-	hypothesis
-	towncrier
-	dkist-data-simulator >= 5.2.0
-	%(inventory)s  # identify pip conflicts in test
-	%(asdf)s  # identify pip conflicts in test
-	%(quality)s  # identify pip conflicts in test
-inventory = 
-	dkist-processing-common[inventory]
-	dkist-inventory==1.4.0
-asdf = 
-	dkist-processing-common[asdf]
-	dkist-inventory[asdf]==1.4.0
-quality = 
-	dkist-quality==1.1.1
-grogu = 
-	dkist
-	pyparsing
-	dkist-inventory >= 1.4.0
-docs = 
-	sphinx
-	sphinx-astropy
-	sphinx-changelog
-	sphinx-autoapi
-	pytest
-	towncrier
-	dkist-sphinx-theme
-
-[build_docs]
-source-dir = docs
-build-dir = docs/_build
-all_files = 1
-
-[tool:pytest]
-markers = 
-	development: For tests that can only be  run while developing with a sidecar proxy (as opposed to in bitbucket pipelines)
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

dkist_processing_cryonirsp-1.3.3/setup.py

@@ -1,4 +0,0 @@
-"""Use setup.cfg to configure packaging."""
-from setuptools import setup
-
-setup(use_scm_version=True)