From 4ceaeebed9194d11935e227ca4ded919c7ebbeea Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 9 Oct 2024 09:11:38 +0200
Subject: [PATCH] Rename --num-procs-eval to --num-parallel-evals

---
 nixpkgs_review/cli/__init__.py |  4 ++--
 nixpkgs_review/cli/pr.py       |  2 +-
 nixpkgs_review/nix.py          |  8 ++++----
 nixpkgs_review/review.py       | 16 ++++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixpkgs_review/cli/__init__.py b/nixpkgs_review/cli/__init__.py
index 74671c0e..ab441ede 100644
--- a/nixpkgs_review/cli/__init__.py
+++ b/nixpkgs_review/cli/__init__.py
@@ -250,10 +250,10 @@ def common_flags() -> list[CommonFlag]:
             help="Extra nixpkgs config to pass to `import <nixpkgs>`",
         ),
         CommonFlag(
-            "--num-procs-eval",
+            "--num-parallel-evals",
             type=int,
             default=1,
-            help="Number of parallel `nix-env` processes to run simultaneously (warning, can imply heavy RAM usage)",
+            help="Number of parallel `nix-env`/`nix eval` processes to run simultaneously (warning, can imply heavy RAM usage)",
         ),
     ]
 
diff --git a/nixpkgs_review/cli/pr.py b/nixpkgs_review/cli/pr.py
index 113aa88e..d92b5063 100644
--- a/nixpkgs_review/cli/pr.py
+++ b/nixpkgs_review/cli/pr.py
@@ -86,7 +86,7 @@ def pr_command(args: argparse.Namespace) -> str:
                     build_graph=args.build_graph,
                     nixpkgs_config=nixpkgs_config,
                     extra_nixpkgs_config=args.extra_nixpkgs_config,
-                    n_procs_eval=args.num_procs_eval,
+                    num_parallel_evals=args.num_parallel_evals,
                 )
                 contexts.append((pr, builddir.path, review.build_pr(pr)))
             except NixpkgsReviewError as e:
diff --git a/nixpkgs_review/nix.py b/nixpkgs_review/nix.py
index b587fd3a..20087356 100644
--- a/nixpkgs_review/nix.py
+++ b/nixpkgs_review/nix.py
@@ -274,10 +274,10 @@ def multi_system_eval(
     attr_names_per_system: dict[System, set[str]],
     allow: AllowedFeatures,
     nix_path: str,
-    n_procs: int,
+    n_threads: int,
 ) -> dict[System, list[Attr]]:
     results: dict[System, list[Attr]] = {}
-    with concurrent.futures.ThreadPoolExecutor(max_workers=n_procs) as executor:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=n_threads) as executor:
         future_to_system = {
             executor.submit(
                 nix_eval,
@@ -305,7 +305,7 @@ def nix_build(
     build_graph: str,
     nix_path: str,
     nixpkgs_config: Path,
-    n_procs_eval: int,
+    n_threads: int,
 ) -> dict[System, list[Attr]]:
     if not attr_names_per_system:
         info("Nothing to be built.")
@@ -315,7 +315,7 @@ def nix_build(
         attr_names_per_system,
         allow,
         nix_path,
-        n_procs=n_procs_eval,
+        n_threads=n_threads,
     )
 
     filtered_per_system: dict[System, list[str]] = {}
diff --git a/nixpkgs_review/review.py b/nixpkgs_review/review.py
index 6f22f807..96255775 100644
--- a/nixpkgs_review/review.py
+++ b/nixpkgs_review/review.py
@@ -108,7 +108,7 @@ def __init__(
         skip_packages_regex: list[Pattern[str]] = [],
         checkout: CheckoutOption = CheckoutOption.MERGE,
         sandbox: bool = False,
-        n_procs_eval: int = 1,
+        num_parallel_evals: int = 1,
     ) -> None:
         self.builddir = builddir
         self.build_args = build_args
@@ -141,7 +141,7 @@ def __init__(
         self.build_graph = build_graph
         self.nixpkgs_config = nixpkgs_config
         self.extra_nixpkgs_config = extra_nixpkgs_config
-        self.n_procs_eval = n_procs_eval
+        self.num_parallel_evals = num_parallel_evals
 
     def worktree_dir(self) -> str:
         return str(self.builddir.worktree_dir)
@@ -186,7 +186,7 @@ def build_commit(
             self.builddir.nix_path,
             self.systems,
             self.allow,
-            n_procs=self.n_procs_eval,
+            n_threads=self.num_parallel_evals,
         )
 
         if reviewed_commit is None:
@@ -199,7 +199,7 @@ def build_commit(
             self.builddir.nix_path,
             self.systems,
             self.allow,
-            n_procs=self.n_procs_eval,
+            n_threads=self.num_parallel_evals,
             check_meta=True,
         )
 
@@ -259,7 +259,7 @@ def build(
             self.build_graph,
             self.builddir.nix_path,
             self.nixpkgs_config,
-            self.n_procs_eval,
+            self.num_parallel_evals,
         )
 
     def build_pr(self, pr_number: int) -> dict[System, list[Attr]]:
@@ -453,11 +453,11 @@ def list_packages(
     nix_path: str,
     systems: set[System],
     allow: AllowedFeatures,
-    n_procs: int,
+    n_threads: int,
     check_meta: bool = False,
 ) -> dict[System, list[Package]]:
     results: dict[System, list[Package]] = {}
-    with concurrent.futures.ThreadPoolExecutor(max_workers=n_procs) as executor:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=n_threads) as executor:
         future_to_system = {
             executor.submit(
                 _list_packages_system,
@@ -650,7 +650,7 @@ def review_local_revision(
             build_graph=args.build_graph,
             nixpkgs_config=nixpkgs_config,
             extra_nixpkgs_config=args.extra_nixpkgs_config,
-            n_procs_eval=args.num_procs_eval,
+            num_parallel_evals=args.num_parallel_evals,
         )
         review.review_commit(builddir.path, args.branch, commit, staged, print_result)
         return builddir.path