Merge 98da90b into sapling-pr-archive-ktf

ktf · Jul 21, 2024 · c6cceca · c6cceca
2 parents 9a241b4 + 98da90b
commit c6cceca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 41 deletions.
diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml
@@ -27,10 +27,10 @@ jobs:
         include:
           - el_version: el7
             container: centos:7
-            alibuild_tag: v1.17.7
+            alibuild_tag: v1.17.10
           - el_version: el8
             container: almalinux:8
-            alibuild_tag: v1.17.7
+            alibuild_tag: v1.17.10
           - el_version: el9
             container: almalinux:9
             alibuild_tag: v1.17.7

diff --git a/jenkins/daily-tags b/jenkins/daily-tags
@@ -14,7 +14,7 @@ try {
 
   stage "Wait pull requests"
   if ("$WAIT_PR" == "true") {
-    node ("slc7_x86-64-light") {
+    node ("slc9_x86-64-light") {
       timeout (240) {
         withEnv(["ALIBOT_SLUG=${ALIBOT_SLUG}",
                  "WAIT_PR_LIMIT=${WAIT_PR_LIMIT}",

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
         # The 7.* series removed support for Python 3.6.
         'setuptools_scm<7.0.0' if sys.version_info < (3, 7) else
         'setuptools_scm'
-    ],
+    ] + ['packaging<=23'] if sys.version_info <(3, 7) else [],
 
     description='ALICE Multipurpose bot',
     long_description=long_description,

diff --git a/test/test_githubCachedRequest.py b/test/test_githubCachedRequest.py