professor: fix style

share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml

@@ -88,7 +88,7 @@ spack:
   - pandorasdk
   - photos +hepmc3
   - podio +rntuple +sio
-  #- professor
+  - professor
   - py-awkward
   - py-boost-histogram
   - py-hepunits

var/spack/repos/builtin/packages/professor/package.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 import os
 
+import spack.util.environment
 from spack.package import *
 
 
@@ -10,10 +11,17 @@ class Professor(Package):
     """Professor Monte-Carlo tuning package"""
 
     homepage = "https://professor.hepforge.org/"
-    url = "https://professor.hepforge.org/downloads/?f=Professor-2.3.3.tar.gz"
+    url = "https://gitlab.com/hepcedar/professor/-/archive/professor-2.5.1/professor-professor-2.5.1.tar.gz"
+    tags = ["hep"]
 
     maintainers("mjk655")
 
+    version("2.5.1", sha256="c49174d1e4117da13083928a57e9bd6a52be25b9ccadee620315742f8e6b9430")
+    version("2.5.0", sha256="3b5791ff02e415fec9fd8ddd7e8e7e35977e1aec51efae39509cf4709dfd2252")
+    version("2.4.2", sha256="469d9b92d078fd621ea2c67383de10457811a1348a64b08fb585fc3a3e1046c1")
+    version("2.4.1", sha256="943199e8a45ae3c48c6d411f810b7ff8f0789db64a9149709e549678cff0b630")
+    version("2.4.0", sha256="8488f12a87080571837809b364864ce4ef079398089b6ea071def30ae43941aa")
+    version("2.3.4", sha256="a4e932170804c8da5ebb41e819d5b3b5484ccfd54b2dcf39e1a1c0ace50b19b7")
     version("2.3.3", sha256="60c5ba00894c809e2c31018bccf22935a9e1f51c0184468efbdd5d27b211009f")
 
     variant(
@@ -28,18 +36,38 @@ class Professor(Package):
     depends_on("eigen")
     depends_on("py-cython")
     depends_on("py-iminuit")
+    depends_on("py-iminuit@2:", when="@2.4.0:")
     depends_on("py-matplotlib")
     depends_on("py-matplotlib backend=wx", when="+interactive")
     depends_on("root")
     depends_on("gmake", type="build")
+    depends_on("py-pip", type="build", when="@2.3.4:")
+    depends_on("py-setuptools", type="build", when="@2.3.4:")
 
     extends("python")
 
+    def url_for_version(self, version):
+        if self.spec.satisfies("@2.4:"):
+            return f"https://gitlab.com/hepcedar/professor/-/archive/professor-{version}/professor-professor-{version}.tar.gz"
+        else:
+            return f"https://professor.hepforge.org/downloads/?f=Professor-{version}.tar.gz"
+
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("PROF_VERSION", self.spec.version)
 
+    @run_before("install")
+    def configure(self):
+        if self.spec.satisfies("@2.5.0:"):
+            with working_dir(self.stage.source_path):
+                Executable("./configure")(
+                    f"--prefix={self.prefix}", f"--with-eigen={self.spec['eigen'].prefix}"
+                )
+
     def install(self, spec, prefix):
-        make()
+        with working_dir(self.stage.source_path):
-        make("PREFIX={0}".format(prefix), "install")
+            # Makefile sets PROF_ROOT to PWD but that is not set for root user in CI
-        if self.spec.satisfies("~interactive"):
+            with spack.util.environment.set_env(PWD=self.stage.source_path):
-            os.remove(join_path(prefix.bin, "prof2-I"))
+                make()
+                make(f"PREFIX={prefix}", "install")
+                if self.spec.satisfies("~interactive"):
+                    os.remove(join_path(prefix.bin, "prof2-I"))