LbProdRun 1.3.1__tar.gz → 1.4.1__tar.gz

{LbProdRun-1.3.1 → LbProdRun-1.4.1}/.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -16,29 +16,29 @@ repos:
         args: [--branch, main]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycQA/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.960
+    rev: v1.0.1
     hooks:
       - id: mypy
         args: [--strict-optional, --ignore-missing-imports]
         additional_dependencies: [types-PyYAML, pydantic]
 
   - repo: "https://gitlab.cern.ch/lhcb-core/LbDevTools.git"
-    rev: 2.0.34
+    rev: 2.0.38
     hooks:
       - id: lb-add-copyright

{LbProdRun-1.3.1/src/LbProdRun.egg-info → LbProdRun-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LbProdRun
-Version: 1.3.1
+Version: 1.4.1
 Summary: CLI for running LHCb applications from LHCbDIRAC
 Home-page: https://gitlab.cern.ch/lhcb-core/lbprodrun
 License: GPL-3.0-only

{LbProdRun-1.3.1 → LbProdRun-1.4.1}/setup.cfg

@@ -42,7 +42,7 @@ console_scripts =
 
 [flake8]
 max-line-length = 80
-ignore = E501,W503,B950,B008,R0903
+ignore = E501,W503,B950,B008,B905
 extend-ignore = 
 	E203,
 select = C,E,F,W,B,B9

{LbProdRun-1.3.1 → LbProdRun-1.4.1}/src/LbProdRun/__init__.py

@@ -11,6 +11,7 @@
 import os
 import re
 import shlex
+import shutil
 from pathlib import Path
 from pprint import pformat
 from typing import Union
@@ -22,12 +23,14 @@ from packaging.version import Version
 from .models import JobSpecV1, read_jobspec
 
 
-def run_job(spec_file: Path, dry_run=False, verbose=False, interactive=False):
+def run_job(
+    spec_file: Path, dry_run=False, verbose=False, interactive=False, prmon=False
+):
     job_spec = read_jobspec(spec_file)
     if verbose:
         typer.secho("Expanded spec file as:", fg=typer.colors.GREEN)
         typer.secho(pformat(job_spec.dict()))
-    execute(job_spec, dry_run=dry_run, interactive=interactive)
+    execute(job_spec, dry_run=dry_run, interactive=interactive, prmon=prmon)
 
 
 def _write_prod_conf_options(job_spec, path: Path, verbose=False):
@@ -64,16 +67,33 @@ def _write_prod_conf_options(job_spec, path: Path, verbose=False):
     path.write_text(string)
 
 
-def execute(job_spec, dry_run=False, interactive=False):
+def execute(job_spec, dry_run=False, interactive=False, prmon=False):
+    command = []
+    new_style = _is_new_style(job_spec.application.name, job_spec.application.version)
+
+    if not prmon:
+        pass
+    elif interactive:
+        typer.secho("Not using prmon as this is an interactive run!", fg="yellow")
+    elif shutil.which("prmon") is None:
+        typer.secho("Not using prmon as it wasn't found on $PATH!", fg="yellow")
+    else:
+        command += ["prmon"]
+        command += ["--interval", os.environ.get("LBPRODRUN_PRMON_INTERVAL", "60")]
+        command += ["--filename", f"prmon_{job_spec.output.prefix}.txt"]
+        command += ["--json-summary", f"prmon_{job_spec.output.prefix}.json"]
+        command += ["--"]
+
     if isinstance(job_spec.application, JobSpecV1.FullDevApplication):
-        command = [str(job_spec.application.run_script.absolute())]
+        command += [str(job_spec.application.run_script.absolute())]
     else:
-        command = ["lb-run"]
+        command += ["lb-run"]
         command += ["--siteroot=/cvmfs/lhcb.cern.ch/lib/"]
         command += ["-c", f"{job_spec.application.binary_tag}"]
         for ep in job_spec.application.data_pkgs:
             command += [f"--use={ep}"]
-        command += ["--use=ProdConf"]
+        if not new_style:
+            command += ["--use=ProdConf"]
 
         if isinstance(job_spec.application, JobSpecV1.ReleaseApplication):
             typer.secho(
@@ -99,7 +119,7 @@ def execute(job_spec, dry_run=False, interactive=False):
         else:
             raise NotImplementedError(type(job_spec.application))
 
-    if _is_new_style(job_spec.application.name, job_spec.application.version):
+    if new_style:
         inner_command = _make_lbexec_command(job_spec)
     else:
         inner_command = _make_gaudirun_command(job_spec)
@@ -136,8 +156,10 @@ def _make_lbexec_command(job_spec):
 
 
 def _write_options_yaml(job_spec, path: Path, verbose=False):
-    """Write an options file for the ProdConf data package"""
+    """Write an options file for lbexec"""
     options = job_spec.options.extra_options.copy()
+    # FIXME: Can't actually use this option yet as it doesn't fail if the keys are missing
+    # options["write_decoding_keys_to_git"] = False
 
     if job_spec.input.files:
         options["input_files"] = job_spec.input.files
@@ -242,6 +264,8 @@ def _is_new_style(name: str, version: str) -> bool:
         parsed_version = Version(re.sub(r"[^\d]+", ".", version).strip("."))
     except Exception:  # pylint: disable=broad-except
         typer.secho(f"Failed to parse {version!r}", fg="red")
+        if version == "HEAD":
+            return True
         return False
 
     version_compatibility: dict[str, Union[bool, Version]] = {

{LbProdRun-1.3.1 → LbProdRun-1.4.1}/src/LbProdRun/__main__.py

@@ -21,11 +21,14 @@ app = typer.Typer()
 def main(
     job_spec: Path = typer.Argument(..., exists=True, dir_okay=False, readable=True),
     dry_run: bool = False,
+    prmon: bool = False,
     verbose: bool = False,
     interactive: bool = False,
 ):
     typer.echo(f"Reading specification from {job_spec}")
-    run_job(job_spec, dry_run=dry_run, verbose=verbose, interactive=interactive)
+    run_job(
+        job_spec, dry_run=dry_run, prmon=prmon, verbose=verbose, interactive=interactive
+    )
 
 
 if __name__ == "__main__":

{LbProdRun-1.3.1 → LbProdRun-1.4.1/src/LbProdRun.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LbProdRun
-Version: 1.3.1
+Version: 1.4.1
 Summary: CLI for running LHCb applications from LHCbDIRAC
 Home-page: https://gitlab.cern.ch/lhcb-core/lbprodrun
 License: GPL-3.0-only