Johnfreeman/129 update dependencies

scripts/spack/make-release-repo.py

@@ -3,6 +3,7 @@
 import os
 import yaml
 import argparse
+import re
 import shutil
 import subprocess
 import tempfile
@@ -108,6 +109,35 @@ def generate_repo_file(self, repo_path):
             f.write(repo_string)
         return
 
+    def generate_homepage_url(self, name, ver):
+        if re.search(r"^dunedaq-v[0-9]", ver):
+            ver_in_url = ver[len("dunedaq-"):]
+            official_doc_page = f"https://dune-daq-sw.readthedocs.io/en/{ver_in_url}/packages/{name}/"
+        else:
+            official_doc_page = f"https://dune-daq-sw.readthedocs.io/en/latest/packages/{name}/"
+
+        irun = subprocess.Popen(f"curl --head --silent --fail {official_doc_page}" , shell=True, stdout=subprocess.PIPE)
+        out = irun.communicate()
+        retval = irun.returncode
+
+        if retval == 0:
+            return official_doc_page
+
+        github_page = f"https://github.com/DUNE-DAQ/{name}/"
+
+        irun = subprocess.Popen(f"curl --head --silent --fail {github_page}" , shell=True, stdout=subprocess.PIPE)
+        out = irun.communicate()
+        retval = irun.returncode
+
+        if retval == 0:
+            return github_page
+
+        # We're probably dealing with an umbrella package if we've made it to this point
+        if re.search(r"^dunedaq-v[0-9]", ver):
+            return f"https://dune-daq-sw.readthedocs.io/en/{ver_in_url}/"
+        else:
+            return f"https://dune-daq-sw.readthedocs.io/en/latest/"
+
     def generate_daq_package(self, repo_path, template_dir):
         repo_dir = os.path.join(repo_path, "spack-repo", "packages")
         template_dir = os.path.join(template_dir, "packages")
@@ -123,13 +153,15 @@ def generate_daq_package(self, repo_path, template_dir):
                 else:
                     lines = lines.replace("XVERSIONX", ipkg["version"])
                 lines = lines.replace("XHASHX", ipkg["commit"])
-                # get commit hash
+                lines = lines.replace("XHOMEPAGEX", self.generate_homepage_url(ipkg["name"], self.rdict["release"]))
+
             ipkg_dir = os.path.join(repo_dir, ipkg["name"])
             os.makedirs(ipkg_dir)
             ipkgpy = os.path.join(ipkg_dir, "package.py")
+
             with open(ipkgpy, 'w') as o:
                 o.write(lines)
-                print(f"Info: package.py has been written at {ipkgpy}.")
+                print(f"Info: from {os.getcwd()}, package.py has been written at {ipkgpy}.")
         return
 
     def generate_umbrella_package(self, repo_path, template_dir):
@@ -143,6 +175,7 @@ def generate_umbrella_package(self, repo_path, template_dir):
             with open(itemp, 'r') as f:
                 lines = f.read()
                 lines = lines.replace("XRELEASEX", self.rdict["release"])
+                lines = lines.replace("XHOMEPAGEX", self.generate_homepage_url(ipkg, self.rdict["release"]))
 
             # now add additional deps:
             if ipkg == 'dunedaq':
@@ -159,14 +192,19 @@ def generate_umbrella_package(self, repo_path, template_dir):
                 else:
                     if "dunedaq" not in self.rdict["release"]:
                         iver = self.rdict["release"]
-                    lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}}")'
+
+                    if iname != "daq-cmake":
+                        lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}}")'
+                    else:
+                        lines += f'\n        depends_on(f"{iname}@{iver} build_type={{build_type}}", when=f"build_type={{build_type}} +dev")'
+
             lines += '\n'
             ipkg_dir = os.path.join(repo_dir, ipkg)
             os.makedirs(ipkg_dir)
             ipkgpy = os.path.join(ipkg_dir, "package.py")
             with open(ipkgpy, 'w') as o:
                 o.write(lines)
-                print(f"Info: package.py has been written at {ipkgpy}.")
+                print(f"Info: from {os.getcwd()}, package.py has been written at {ipkgpy}.")
         return
 
     def generate_repo(self, outdir, tempdir, update_hash, release_name):

spack-repos/externals/packages/uhal/package.py

@@ -10,7 +10,6 @@ class Uhal(Package):
 
     version('2.8.1', sha256='73f26639a16ea65cecd367045ad0767a7eb4f5f8f488df1bbf121fc47aec3142', extension='tar.gz')
 
-    #depends_on('[email protected]+debug', type='build')
     depends_on('boost', type='build')
     depends_on('[email protected]', type=('build', 'link', 'run'))
     depends_on('[email protected]', type=('build', 'link', 'run'))

spack-repos/release-repo-template/packages/appfwk/package.py

@@ -10,15 +10,16 @@
 class Appfwk(CMakePackage):
     """Home of daq_application and tools for writing DAQ modules"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/appfwk/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/appfwk.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
 
-    depends_on('daq-cmake')
+    depends_on('daq-cmake', type=('build', 'run'))
+    depends_on('py-moo', type=('build'))
     depends_on('logging')
     depends_on('cetlib')
     depends_on('ers')
@@ -28,9 +29,8 @@ class Appfwk(CMakePackage):
     depends_on('opmonlib')
 
     depends_on('nlohmann-json')
+    depends_on('boost', type='build' )
     depends_on("[email protected]")
-    depends_on('py-moo', type='build')
-    depends_on('boost' )
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/cmdlib/package.py

@@ -10,22 +10,21 @@
 class Cmdlib(CMakePackage):
     """Interfaces for commanded objects"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/cmdlib/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/cmdlib.git"
 
     maintainers = ['jcfreeman2']
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on('daq-cmake')
-    depends_on('nlohmann-json')
+    depends_on("daq-cmake", type="build")
+    depends_on("py-moo", type="build")
     depends_on('cetlib')
+    depends_on('intel-tbb')
+    depends_on('nlohmann-json')
     depends_on('logging')
     depends_on('ers')
 
-    depends_on('intel-tbb')
-    depends_on('py-moo', type='build')
-
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):
         if str(self.spec.variants['build_type']) == "build_type=Debug":

spack-repos/release-repo-template/packages/ctbmodules/package.py

@@ -10,21 +10,21 @@
 class Ctbmodules(CMakePackage):
     """Control modules for the Central Trigger Board"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/ctbmodules/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/ctbmodules.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
+    depends_on("daq-cmake", type="build")
+    depends_on("py-moo", type="build")
     depends_on("rcif")
     depends_on("appfwk")
     depends_on("opmonlib")
     depends_on("logging")
     depends_on("ers")
 
-    depends_on("py-moo", type='build')
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/daq-cmake/package.py

@@ -10,14 +10,15 @@
 class DaqCmake(CMakePackage):
     """CMake support for DUNE-DAQ packages"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/daq-cmake/"
+    homepage = "XHOMEPAGEX"
     git      = "https://github.com/DUNE-DAQ/daq-cmake.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("py-pybind11")
+    depends_on("py-pybind11", type=("run"))
+    depends_on("cmake", type=("build"))
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/daqconf/package.py

@@ -10,15 +10,14 @@
 class Daqconf(CMakePackage):
     """Application to read out Felix data and store it in HDF5 files on disk"""
 
-    homepage = "https://github.com/DUNE-DAQ/daqconf"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/daqconf.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
-    depends_on("py-moo", type='build')
+    depends_on("daq-cmake", type=("build", "run"))
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/daqdataformats/package.py

@@ -10,16 +10,15 @@
 class Daqdataformats(CMakePackage):
     """DUNE DAQ data formats"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/daqdataformats/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/daqdataformats.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
-    depends_on('boost' )
-    depends_on('py-moo', type='build')
+    depends_on("daq-cmake", type="build")
+    depends_on('boost', type='build' )
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/dataformats/package.py

@@ -10,15 +10,15 @@
 class Dataformats(CMakePackage):
     """Raw data reinterpretation utilities"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/dunedaq-v2.8.0/packages/dataformats/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/dataformats.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
 
-    depends_on("daq-cmake")
+    depends_on("daq-cmake", type="build")
     depends_on("ers")
     depends_on('boost' )
     depends_on("logging")

spack-repos/release-repo-template/packages/detchannelmaps/package.py

@@ -10,18 +10,17 @@
 class Detchannelmaps(CMakePackage):
     """DUNE detectors channel maps"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/detchannelmaps/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/detchannelmaps.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
+    depends_on("daq-cmake", type="build")
     depends_on("cetlib")
     depends_on("logging")
     depends_on("ers")
-    depends_on('py-moo', type='build')
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/detdataformats/package.py

@@ -10,16 +10,15 @@
 class Detdataformats(CMakePackage):
     """DUNE detectors data formats"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/detdataformats/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/detdataformats.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
-    depends_on("boost")
-    depends_on('py-moo', type='build')
+    depends_on("daq-cmake", type="build")
+    depends_on("boost", type="build")
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/devtools/package.py

@@ -8,9 +8,9 @@
 
 
 class Devtools(BundlePackage):
-    """The DUNE DAQ development tools"""
+    """An umbrella package which pulls in the DUNE DAQ development tools"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/"
+    homepage = "XHOMEPAGEX"
 
     version("XRELEASEX")
 

spack-repos/release-repo-template/packages/dfmessages/package.py

@@ -10,18 +10,17 @@
 class Dfmessages(CMakePackage):
     """Dataflow messages"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/dfmessages/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/dfmessages.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
-    depends_on("daq-cmake")
-    depends_on("serialization")
+    depends_on("daq-cmake", type="build")
     depends_on("daqdataformats")
-
-    depends_on('boost' )
+    depends_on("serialization")
+    depends_on('boost', type='build' )
 
     # DBT_DEBUG is used by daq-cmake to set compiler options
     def cmake_args(self):

spack-repos/release-repo-template/packages/dfmodules/package.py

@@ -10,15 +10,16 @@
 class Dfmodules(CMakePackage):
     """Dataflow Applications"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/dfmodules/"
+    homepage = "XHOMEPAGEX"
     git =      "https://github.com/DUNE-DAQ/dfmodules.git"
 
     maintainers = ["jcfreeman2"]
 
     version("XVERSIONX", commit="XHASHX")
 
 
-    depends_on("daq-cmake")
+    depends_on("daq-cmake", type=("build", "run"))
+    depends_on("py-moo", type="build")
     depends_on("appfwk")
     depends_on("logging")
     depends_on("ers")
@@ -31,9 +32,6 @@ class Dfmodules(CMakePackage):
     depends_on("trigger")
     depends_on("serialization")
     depends_on("readoutlibs")
-
-    depends_on("py-moo", type='build')
-
     depends_on("boost")
 
     # DBT_DEBUG is used by daq-cmake to set compiler options