windows

Author: Tieqiong

requirements/packs/scripts/_pytest.bat

@@ -0,0 +1,118 @@
+@echo off
+REM Usage:
+REM   _pytest.bat urls.txt
+REM   _pytest.bat https://host/a.tar.gz https://host/b.tgz
+REM From ChatGPT
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+REM ---- temp workspace under %TEMP% ----
+set "TMPROOT=%TEMP%\remote_tests_%RANDOM%%RANDOM%"
+md "%TMPROOT%" || (echo Failed to create TMPROOT & exit /b 1)
+
+REM ---- resolve args -> URL list file ----
+if "%~2"=="" (
+  if exist "%~1" (
+    set "URLS_FILE=%~f1"
+  ) else (
+    set "URLS_FILE=%TMPROOT%\urls.txt"
+    > "%URLS_FILE%" echo %~1
+  )
+) else (
+  set "URLS_FILE=%TMPROOT%\urls.txt"
+  (for %%U in (%*) do @echo %%~U) > "%URLS_FILE%"
+)
+
+pushd "%TMPROOT%" >nul || (echo Failed to enter TMPROOT & exit /b 1)
+
+set /a i=0
+set /a overall_ec=0
+
+REM read URL file line-by-line; hand off each line to a subroutine
+for /f "usebackq delims=" %%L in ("%URLS_FILE%") do call :process_one "%%L"
+
+popd >nul
+rmdir /s /q "%TMPROOT%" >nul 2>&1
+exit /b %overall_ec%
+
+REM ===================== subroutine =====================
+:process_one
+setlocal EnableExtensions EnableDelayedExpansion
+
+REM grab the raw line and trim leading spaces
+set "url=%~1"
+if "%url%"=="" (endlocal & goto :eof)
+:trim
+if not "%url:~0,1%"==" " goto :trim_done
+set "url=%url:~1%"
+goto trim
+:trim_done
+
+REM skip comments
+if "%url:~0,1%"=="#" (endlocal & goto :eof)
+
+REM ----- do the work for this URL -----
+endlocal & set /a i+=1 & set "URL=%url%"
+echo(
+echo ==> [%i%]
+
+set "PKGDIR=%TMPROOT%\pkg_%i%"
+md "%PKGDIR%"
+pushd "%PKGDIR%" >nul || goto :after
+
+REM download archive into PKGDIR
+curl -L --fail -o "archive.tar.gz" "%URL%"
+if errorlevel 1 (
+  echo curl failed
+  set /a overall_ec=1
+  popd >nul & goto :after
+)
+
+REM extract (try gzip flags, then plain)
+tar -xzf "archive.tar.gz" >nul 2>&1
+if errorlevel 1 tar -xf "archive.tar.gz" >nul 2>&1
+if errorlevel 1 (
+  echo tar extract failed
+  set /a overall_ec=1
+  popd >nul & goto :after
+)
+
+REM get first entry (try -tzf, then -tf)
+set "FIRST="
+for /f "delims=" %%F in ('tar -tzf "archive.tar.gz" 2^>nul') do set "FIRST=%%F" & goto got_first
+for /f "delims=" %%F in ('tar -tf  "archive.tar.gz" 2^>nul') do set "FIRST=%%F" & goto got_first
+:got_first
+
+REM choose project root (top dir if present)
+set "PROJROOT=%CD%"
+if defined FIRST for /f "tokens=1 delims=/" %%T in ("%FIRST%") do if exist ".\%%T\" set "PROJROOT=%CD%\%%T"
+
+REM mirror original: drop src\ if present
+if exist "%PROJROOT%\src\" rmdir /s /q "%PROJROOT%\src" >nul 2>&1
+
+REM run pytest from repo root (with tests on PYTHONPATH if exists)
+pushd "%PROJROOT%" >nul
+echo Running pytest in: "%CD%"
+set "OLD_PYTHONPATH=%PYTHONPATH%"
+if exist "tests\" (
+  if defined OLD_PYTHONPATH (
+    set "PYTHONPATH=%CD%;tests;%OLD_PYTHONPATH%"
+  ) else (
+    set "PYTHONPATH=%CD%;tests"
+  )
+) else (
+  if defined OLD_PYTHONPATH (
+    set "PYTHONPATH=%CD%;%OLD_PYTHONPATH%"
+  ) else (
+    set "PYTHONPATH=%CD%"
+  )
+)
+pytest
+if errorlevel 1 set /a overall_ec=1
+set "PYTHONPATH=%OLD_PYTHONPATH%"
+popd >nul
+
+popd >nul
+:after
+rmdir /s /q "%PKGDIR%" >nul 2>&1
+goto :eof

requirements/profiles/_tests.yml

@@ -9,3 +9,4 @@ packs:
 
 extras:
   - _pytest.sh tar_url.txt
+  - _pytest.bat tar_url.txt

src/diffpy/cmi/conda.py

@@ -16,6 +16,7 @@
 import json
 import subprocess
 import sys
+import os
 from dataclasses import dataclass
 from pathlib import Path
 from typing import List, Optional, Sequence, Tuple
@@ -97,10 +98,18 @@ def run(
     do_capture = (not dbg) if capture is None else bool(capture)
     qcmd = " ".join(str(x) for x in cmd)
 
+    win = (os.name == "nt")
+    prog = str(cmd[0]).lower() if cmd else ""
+    needs_cmd = win and (
+        prog.endswith("\\conda.bat") or prog.endswith("\\mamba.bat")
+        or prog in ("conda", "conda.bat", "mamba", "mamba.bat")
+    )
+    argv = (["cmd", "/c"] + list(cmd)) if needs_cmd else list(cmd)
+
     try:
         if do_capture:
             cp = subprocess.run(
-                list(cmd),
+                argv,
                 cwd=str(cwd) if cwd else None,
                 capture_output=True,
                 text=True,
@@ -119,7 +128,7 @@ def run(
                     sys.stderr.flush()
         else:
             cp = subprocess.run(
-                list(cmd),
+                argv,
                 cwd=str(cwd) if cwd else None,
                 text=True,
                 check=False,

src/diffpy/cmi/installer.py

@@ -200,8 +200,6 @@ def _script_supported_on_platform(ext: str) -> bool:
     """
     ext = (ext or "").lower()
     if os.name == "nt":
-        if ext == ".sh":
-            return shutil.which("bash") is not None
         return ext == ".bat"
     return ext == ".sh"
 
@@ -262,11 +260,6 @@ def _script_exec_cmd(path: Path, args: List[str]) -> List[str]:
     """
     ext = path.suffix.lower()
     if os.name == "nt":
-        if ext == ".sh":
-            bash = shutil.which("bash")
-            if bash:
-                return [bash, str(path)] + args
-            return [str(path)] + args
         if ext != ".bat":
             return [str(path)] + args
         return ["cmd", "/c", str(path)] + args
@@ -338,7 +331,10 @@ def install_requirements(
 
     # Execute scripts
     for r in reqs:
-        if r.kind != "script":
+        if r.kind != "script" or not r.name:
+            continue
+        if not r.name.startswith("_") and _is_installed(r.name):
+            plog.info("Skipping script (already satisfied): %s", r.raw.strip())
             continue
         first_token = shlex.split(r.raw.strip(), posix=(os.name != "nt"))[0]
         ext = Path(first_token).suffix.lower()