Merge pull request #389 from DUNE-DAQ/amogan/build_python_packages_wi…

…th_default_develop Build Python packages from develop
DUNE-DAQ · Sep 26, 2024 · 3dde95a · 3dde95a
2 parents e4e8170 + cd8f9f5
commit 3dde95a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/configs/fddaq/fddaq-develop/release.yaml b/configs/fddaq/fddaq-develop/release.yaml
@@ -100,7 +100,7 @@
           version: 5.2.0
           source:  pypi
         - name: connectivityserver
-          version: 1.0.0
+          version: develop
           source:  github_DUNE-DAQ
         - name: deepdiff
           version: 6.3.1
@@ -109,16 +109,16 @@
           version: 5.0.3
           source:  pypi
         - name: daq-assettools
-          version: 1.1.0
+          version: develop
           source:  github_DUNE-DAQ
         - name: drunc
-          version: 0.10.6
+          version: develop
           source:  github_DUNE-DAQ
         - name: druncschema
-          version: 0.8.2
+          version: develop
           source:  github_DUNE-DAQ
         - name: elisa-client-api
-          version: 1.0.0
+          version: develop
           source:  github_DUNE-DAQ
         - name: et-xmlfile
           version: 1.0.1
@@ -184,7 +184,7 @@
           version: 1.1.1
           source:  pypi
         - name: integrationtest
-          version: 3.0.1
+          version: develop
           source:  github_DUNE-DAQ
         - name: itsdangerous
           version: 2.0.1
@@ -229,7 +229,7 @@
           version: 2.0.0
           source:  pypi
         - name: nanorc
-          version: 5.2.0
+          version: develop
           source:  github_DUNE-DAQ
         - name: networkx
           version: 2.6.3

diff --git a/scripts/spack/make-release-repo.py b/scripts/spack/make-release-repo.py
@@ -9,7 +9,7 @@
 import re
 
 from dr_tools import parse_yaml_file
-from mappings import cmake_to_spack
+from mappings import cmake_to_spack, pyvenv_url_names
 
 class MyDumper(yaml.Dumper):
 
@@ -299,16 +299,15 @@ def generate_pyvenv_requirements(self, output_file):
                 if i["source"] == "pypi":
                     iline = f'{iname}=={iversion}'
                 if i["source"].startswith("github"):
-                    iline = f"git+https://github.com/"
                     iuser = i["source"].replace("github_", "")
-                    if iname == "moo":
-                        iline = f"git+https://github.com/{iuser}/{iname}@{iversion}#egg={iname}"
-                    elif iname == "elisa-client-api":
-                        iline = f"git+https://github.com/{iuser}/elisa_client_api@v{iversion}#egg={iname}"
-                    elif iname == "connectivityserver":
-                        iline = f"git+https://github.com/{iuser}/{iname}@v{iversion}#egg=connection-service"
+                    # Special cases are handled using a dictionary in mappings.py
+                    repo_name = pyvenv_url_names.get(iname, {}).get("repo_name", iname)
+                    egg_name = pyvenv_url_names.get(iname, {}).get("egg_name", repo_name)
+
+                    if iversion == "develop" or iname == "moo":
+                        iline = f"git+https://github.com/{iuser}/{repo_name}@{iversion}#egg={egg_name}"
                     else:
-                        iline = f"git+https://github.com/{iuser}/{iname}@v{iversion}#egg={iname}"
+                        iline = f"git+https://github.com/{iuser}/{repo_name}@v{iversion}#egg={egg_name}"
                 f.write(iline + '\n')
         return
 

diff --git a/scripts/spack/mappings.py b/scripts/spack/mappings.py
@@ -13,3 +13,8 @@
     'pkgconfig': 'pkgconf',
     'tbb': 'intel-tbb',
 }
+
+pyvenv_url_names = {
+    "elisa-client-api": {"repo_name": "elisa_client_api"},
+    "connectivityserver": {"egg_name": "connection-service"},
+}