#132 Merge pull request from deshima-dev/astropenguin/issue130

Fix to handle cases where fit errors are None

.devcontainer/devcontainer.json

@@ -1,13 +1,17 @@
 {
     "name": "demerge",
     "image":"python:3.11",
-    "runArgs": [
-        "--name=demerge"
-    ],
+    "features": {
+        "ghcr.io/devcontainers-contrib/features/poetry:2": {
+            "version": "1.8.3"
+        }
+    },
     "containerEnv": {
         "POETRY_VIRTUALENVS_CREATE": "false"
     },
-    "onCreateCommand": "pip install poetry==1.8.3",
+    "runArgs": [
+        "--name=demerge"
+    ],
     "postCreateCommand": "poetry install",
     "customizations": {
         "vscode": {

.github/workflows/tests.yaml

@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - main
-      - deshima2.0
   pull_request:
     branches:
       - main
-      - deshima2.0
 
 jobs:
   job:
@@ -21,13 +19,16 @@ jobs:
       matrix:
         python: ["3.9", "3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - run: pip install poetry==1.7.1 && poetry install
+      - uses: abatilo/actions-poetry@v3
+        with:
+          poetry-version: "1.8.3"
+      - run: poetry install
       - run: black --check demerge
       - run: deshima-rawdata download 20231108052231 -e
       - run: demerge 20231108052231 --measure brightness --debug

CITATION.cff

@@ -31,5 +31,5 @@ keywords:
   - spectroscopy
   - deshima
 license: MIT
-version: 3.0.1
-date-released: '2024-07-02'
+version: 3.0.2
+date-released: '2024-07-03'

README.md

@@ -11,7 +11,7 @@ DESHIMA merge code for observed datasets
 ## Installation
 
 ```shell
-pip install demerge==3.0.1
+pip install demerge==3.0.2
 ```
 
 ## Command line interface

demerge/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ["demerge", "merge", "reduce"]
-__version__ = "3.0.1"
+__version__ = "3.0.2"
 
 
 # standard library

demerge/reduce/__init__.py

@@ -61,18 +61,21 @@ def reduce(
     with TemporaryDirectory() as work_dir:
         run(
             ["python", SCRIPTS / "Configure.py", data_dir, reduced_dir],
+            check=True,
             cwd=work_dir,
             # False if logging is implemented
             capture_output=True,
         )
         run(
             ["python", SCRIPTS / "FitSweep.py"],
+            check=True,
             cwd=work_dir,
             # False if logging is implemented
             capture_output=True,
         )
         run(
             ["python", SCRIPTS / "SaveFits.py"],
+            check=True,
             cwd=work_dir,
             # False if logging is implemented
             capture_output=True,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "demerge"
-version = "3.0.1"
+version = "3.0.2"
 description = "DESHIMA merge code for observed datasets"
 authors = [
     "Tatsuya Takekoshi <[email protected]>",
@@ -36,7 +36,7 @@ zarr = "^2.14"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4"
-deshima-rawdata = "^2024.4.2"
+deshima-rawdata = "^2024.4"
 ipython = "^8.18"
 
 [tool.poetry.scripts]