Improve package version tracking. Remove requirement on artdaq version

Author: eflumerf

rc/control/bookkeeping.py

@@ -20,83 +20,6 @@
 
 def bookkeeping_for_fhicl_documents_artdaq_v3_base(self):
 
-    # Determine that the artdaq package used is new enough to be
-    # compatible with the assumptions made by DAQInterface about the
-    # interface artdaq offers
-
-    # JCF, Nov-20-2018: update this when ready to require subsystem-compatible
-    # artdaq
-
-    if os.path.exists(self.daq_dir + "/srcs/artdaq"):
-        commit_check_throws_if_failure(
-            self.daq_dir + "/srcs/artdaq",
-            "b434f3b71dd5c87da68d6b13f040701ff610fee1",
-            "July 15, 2018",
-            True,
-        )
-    else:
-
-        # JCF, Sep-20-2018: not yet logic for requiring an artdaq
-        # version with a letter at the end of it (e.g., v3_02_01a as
-        # opposed to v3_02_01)
-
-        min_majorver = "3"
-        min_minorver = "03"
-        min_minorerver = "00"
-
-        # ...so we'll also have a list of versions where if the artdaq
-        # version matches one of them, we'll be considered OK
-
-        other_allowed_versions = ["v3_02_01a"]
-
-        self.fill_package_versions(["artdaq"])
-        version = self.package_versions["artdaq"]
-
-        res = re.search(r"v([0-9]+)_([0-9]+)_([0-9]+)(.*)", version)
-
-        if not res:
-            raise Exception(
-                "Problem parsing the calculated version of artdaq, %s" % (version)
-            )
-
-        majorver = res.group(1)
-        minorver = res.group(2)
-        minorerver = res.group(3)
-        extension = res.group(4)
-
-        passes_requirement = False
-
-        if int(majorver) > int(min_majorver):
-            passes_requirement = True
-        elif int(majorver) == int(min_majorver):
-            if int(minorver) > int(min_minorver):
-                passes_requirement = True
-            elif int(minorver) == int(min_minorver):
-                if int(minorerver) >= int(min_minorerver):
-                    passes_requirement = True
-
-        if not passes_requirement:
-            for an_allowed_version in other_allowed_versions:
-                if version == an_allowed_version:
-                    passes_requirement = True
-
-        if not passes_requirement:
-            raise Exception(
-                make_paragraph(
-                    'Version of artdaq set up by setup script "%s" is v%s_%s_%s%s; need a version at least as recent as v%s_%s_%s'
-                    % (
-                        self.daq_setup_script,
-                        majorver,
-                        minorver,
-                        minorerver,
-                        extension,
-                        min_majorver,
-                        min_minorver,
-                        min_minorerver,
-                    )
-                )
-            )
-
     # Start calculating values (fragment counts, memory sizes, etc.)
     # which will need to appear in the FHiCL
 

rc/control/daqinterface.py

@@ -2033,26 +2033,12 @@ def fill_package_versions(self, packages):
             if package in self.package_versions:
                 continue
             else:
-                needed_packages.append(package if self.productsdir != None else package.replace("_", "-"))
+                needed_packages.append(package)
 
         if len(needed_packages) == 0:
             return
 
-        if "artdaq_daqinterface" in packages:
-            assert (
-                len(packages) == 1
-            ), "Note to developer: you'll probably need to refactor save_run_records.py if you want to get the version of other packages alongside the version of DAQInterface"
-            cmd = "ups active | sed -r -n 's/^artdaq_daqinterface\\s+(\\S+).*/artdaq_daqinterface \\1/p'"
-        elif self.productsdir != None:
-            cmd = (
-                "%s ; . %s; ups active | sed -r -n 's/^(%s)\\s+(\\S+).*/\\1 \\2/p'"
-                % (
-                    ";".join(get_setup_commands(self.productsdir, self.spackdir)),
-                    self.daq_setup_script,
-                    "|".join(needed_packages),
-                )
-            )
-        elif self.spackdir != None:
+        if self.spackdir != None:
             cmd = (
                 "%s ; . %s; spack find --loaded | sed -r -n 's/^(%s)@(\\S+).*/\\1 \\2/p'" % (
                     ";".join(get_setup_commands(self.productsdir, self.spackdir)),
@@ -2122,7 +2108,7 @@ def fill_package_versions(self, packages):
                             )
                         )
                     # print('package=%s type(package)=%s' % (package,type(package)))
-                    self.package_versions[package.replace("-", "_")] = version
+                    self.package_versions[package] = version
 
         for package in packages:
             if package not in self.package_versions:

rc/control/save_run_record.py

@@ -225,7 +225,7 @@ def save_run_record_base(self):
 
     for pkgname in self.package_hashes_to_save:
 
-        pkg_full_path = "%s/srcs/%s" % (self.daq_dir, pkgname.replace("-", "_"))
+        pkg_full_path = "%s/srcs/%s" % (self.daq_dir, pkgname)
         commit_info_fullpathname = "%s/%s" % (
             os.path.dirname(self.daq_setup_script),
             get_commit_info_filename(pkgname),
@@ -248,14 +248,12 @@ def save_run_record_base(self):
             # We'll throw this on the list of packages whose actual versions we need to figure out in real-time
             packages_whose_versions_we_need.append(pkgname)
 
-    self.fill_package_versions(
-        [pkg.replace("-", "_") for pkg in packages_whose_versions_we_need]
-    )
+    self.fill_package_versions( packages_whose_versions_we_need    )
 
     for pkgname in packages_whose_versions_we_need:
         package_commit_dict[pkgname] = "%s commit/version: %s" % (
             pkgname,
-            self.package_versions[pkgname.replace("-", "_")],
+            self.package_versions[pkgname],
         )
 
     for pkg in sorted(package_commit_dict.keys()):