add cmi test steps in matrix

macos-13 shell script support
Use personal diffpy.utils tests source temporaly
properly pass exit code for install cmd

Author: Tieqiong

.github/workflows/matrix-and-codecov-on-merge-to-main.yml

@@ -17,5 +17,23 @@ jobs:
       project: diffpy.cmi
       c_extension: false
       headless: false
+      run: |
+        set -Eeuo pipefail
+        echo "Test cmds"
+        cmi -h
+        cmi env
+        cmi pack list
+        cmi profile list
+        cmi install plotting
+        if [ "${RUNNER_OS}" != "Windows" ]; then
+          conda list | grep -i ipympl
+        else
+          source "$(cygpath -u "$CONDA")/etc/profile.d/conda.sh"
+          conda activate test
+          conda list | grep -i ipympl
+        fi
+
+        echo "Running tests for diffpy.cmi dependencies"
+        cmi install _tests
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/tests-on-pr.yml

@@ -12,7 +12,22 @@ jobs:
       c_extension: false
       headless: false
       run: |
-        echo "Running tests for diffpy.cmi"
+        set -Eeuo pipefail
+        echo "Test cmds"
+        cmi -h
+        cmi env
+        cmi pack list
+        cmi profile list
+        cmi install plotting
+        if [ "${RUNNER_OS}" != "Windows" ]; then
+          conda list | grep -i ipympl
+        else
+          source "$(cygpath -u "$CONDA")/etc/profile.d/conda.sh"
+          conda activate test
+          conda list | grep -i ipympl
+        fi
+
+        echo "Running tests for diffpy.cmi dependencies"
         cmi install _tests
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

requirements/packs/scripts/_pytest.sh

@@ -19,42 +19,45 @@ else
 fi
 
 START_DIR="$PWD"
-TMPROOT="$(mktemp -d -p "$START_DIR" ".tmp_remote_tests.XXXXXX")"
+TMPROOT="$(TMPDIR="$START_DIR" mktemp -d -t .tmp_remote_tests.XXXXXXXX)"
 trap 'cd "$START_DIR" 2>/dev/null || true; rm -rf -- "$TMPROOT"' EXIT
 cd "$TMPROOT"
 
 overall_ec=0
 i=0
 for url in "${URLS[@]}"; do
   ((++i))
-  echo -e "\n==> [$i] $url"
+  printf '\n==> [%d] %s\n' "$i" "$url"
 
-  tarball="$(mktemp -p "$TMPROOT" "dl_${i}.XXXXXX.tar.gz")"
+  tfile="$(TMPDIR="$TMPROOT" mktemp -t "dl_${i}.XXXXXXXX")"
+  tarball="${tfile}.tar.gz"
   curl -L --fail -o "$tarball" "$url"
 
   pkgdir="$TMPROOT/pkg_${i}"
   mkdir -p "$pkgdir"
-  tar -xzf "$tarball" -C "$pkgdir"
+  tar -xzf "$tarball" -C "$pkgdir" 2>/dev/null || tar -xf "$tarball" -C "$pkgdir"
+
+  first_entry="$(tar -tzf "$tarball" 2>/dev/null | head -1 || true)"
+  if [ -z "$first_entry" ]; then
+    first_entry="$(tar -tf "$tarball" 2>/dev/null | head -1 || true)"
+  fi
 
-  first_entry="$(tar -tzf "$tarball" | head -1 || true)"
   top="${first_entry%%/*}"
   if [ -n "$top" ] && [ -d "$pkgdir/$top" ]; then
     projroot="$pkgdir/$top"
   else
     projroot="$pkgdir"
   fi
 
-  if [ -d "$projroot/src" ]; then
-    rm -rf -- "$projroot/src"
-  fi
+  [ -d "$projroot/src" ] && rm -rf -- "$projroot/src"
 
   if [ -d "$projroot/tests" ]; then
     ( cd "$projroot" && PYTHONPATH="$PWD:tests:${PYTHONPATH:-}" pytest ) || overall_ec=1
   else
     ( cd "$projroot" && PYTHONPATH="$PWD:${PYTHONPATH:-}" pytest ) || overall_ec=1
   fi
 
-  rm -f -- "$tarball"
+  rm -f -- "$tarball" "$tfile"
   rm -rf -- "$pkgdir"
 done
 

requirements/packs/scripts/tar_url.txt

@@ -2,4 +2,4 @@ https://github.com/diffpy/diffpy.srreal/archive/refs/tags/1.4.0.tar.gz
 https://github.com/diffpy/diffpy.srfit/archive/refs/tags/3.2.0.tar.gz
 https://github.com/diffpy/pyobjcryst/archive/refs/tags/2025.1.0.tar.gz
 https://github.com/diffpy/diffpy.structure/archive/refs/tags/3.3.1.tar.gz
-https://github.com/diffpy/diffpy.utils/archive/refs/tags/3.6.1.tar.gz
+https://github.com/Tieqiong/diffpy.utils/archive/refs/tags/3.6.2-rc.0.tar.gz

requirements/profiles/_tests.yml

@@ -4,7 +4,6 @@
 packs:
   - core
   - pdf
-  - plotting
   - tests
 
 extras:

src/diffpy/cmi/cli.py

@@ -464,16 +464,20 @@ def _cmd_install(ns: argparse.Namespace) -> int:
         try:
             kind, path = _resolve_target_for_install(tgt)
             if kind == "pack":
-                mgr.install_pack(path.stem)
+                r = mgr.install_pack(path.stem)
             else:
-                pm.install(path if path.is_absolute() else path.stem)
+                r = pm.install(path if path.is_absolute() else path.stem)
+            if isinstance(r, bool):
+                if not r: rc = max(rc, 1)
+            elif isinstance(r, int):
+                rc = max(rc, r)
         except (ValueError, FileNotFoundError) as e:
             plog.error("%s", e)
             ns._parser.print_help()
-            rc = 1
+            rc = max(rc, 1)
         except Exception as e:
             plog.error("%s", e)
-            rc = 1
+            rc = max(rc, 1)
     return rc
 
 

src/diffpy/cmi/profilesmanager.py

@@ -191,7 +191,10 @@ def install(self, identifier: Union[str, Path]) -> None:
         scripts_root = self.packs_mgr.packs_dir / "scripts"
 
         plog.info("Installing profile: %s", prof.name)
-        if install_requirements(reqs, scripts_root=scripts_root) == 0:
+        exit_code = install_requirements(reqs, scripts_root=scripts_root)
+        if exit_code == 0:
             plog.info("Profile '%s' installation complete.", prof.name)
         else:
             plog.error("Profile '%s' installation failed.", prof.name)
+
+        return exit_code