Merge branch '24.05.ug' into 24.11.ug

Author: itkovian

README.md

@@ -2,6 +2,15 @@
 
 pyslurm is the Python client library for the [Slurm Workload Manager](https://slurm.schedmd.com)
 
+## Fork from VUB-HPC
+This fork adds specific tooling and patches to PySlurm that are needed to build
+and install this software in our HPC clusters.
+
+Command to build the RPM of PySlurm from our build servers:
+```
+clusterbuildrpm -d -r pub -f vub-hpc -p pyslurm -b vub-hpc
+```
+
 ## Requirements
 
 * [Slurm](https://slurm.schedmd.com) - Slurm shared library and header files

bdist_rpm.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+VERSION=$(grep "Version:.*[0-9]" pyslurm.spec | tr -s " " |  awk '{print $2;}')
+RELEASE=$(grep "%global.*rel.*[-1-9]" pyslurm.spec | tr -s " " | awk '{print $3}')
+
+echo $VERSION
+echo $RELEASE
+
+if [ "${RELEASE}" -gt 1 ]; then
+    SUFFIX=${VERSION}-${RELEASE}
+else
+    SUFFIX=${VERSION}
+fi
+
+GITTAG=$(git log --format=%ct.%h -1)
+
+mkdir -p BUILD SOURCES SPECS RPMS BUILDROOT
+git archive --format=tar.gz -o "SOURCES/pyslurm-${SUFFIX}.tar.gz" --prefix="pyslurm-${SUFFIX}/" HEAD
+cp pyslurm.spec "SPECS"
+rpmbuild --define "gittag ${GITTAG}" --define "_topdir $PWD" -ba SPECS/pyslurm.spec

buildrpmfromspec.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+if [[ -z "$1" || -d "$1" ]]; then
+    echo "You didn't specify anything to build";
+    if [ -d "$1" ]
+    then
+        cd "$1" || exit
+    fi
+    spec=$(ls ./*.spec | head -1)
+    if [ -z "$spec" ]
+    then
+        echo "No spec file found. Exiting."
+        exit 1;
+    else
+        reg='Name: '
+        name=$(grep "$reg" "$spec" | sed -e "s/$reg//" -e "s/ //g")
+        reg='Version: '
+        echo "Found spec $spec: name $name"
+    fi
+else
+    spec=$1.spec
+    name="$1"
+fi
+
+if grep -qE 'Fedora|release [6-9]' /etc/redhat-release >& /dev/null
+then
+  myrpmbasedir=$HOME/rpmbuild
+else
+  myrpmbasedir=/usr/src/redhat
+fi
+
+rpmbasedir=${BDISTRPMBASEDIR:-$myrpmbasedir}
+
+echo "----> Building rpm for $name"
+src_dir=$PWD
+echo "----> Using $src_dir"
+
+# delete older versions of the rpm since there's no point having old
+# versions in there when we still have the src.rpms in the SRPMS dir
+echo "----> Cleaning up older packages"
+find "$rpmbasedir/RPMS" -type f -name "${name}-[0-9]\*" -delete
+
+echo "----> Installing specfile requires"
+sudo dnf -y builddep "$spec" 
+
+echo "----> Building the package"
+
+# -ba: source and binary
+# no debuginfo
+# download sources from remote
+rpmbuild \
+    --define "_sourcedir $src_dir" \
+    --define "_topdir $rpmbasedir" \
+    --undefine=_disable_source_fetch \
+    --without debuginfo \
+    -ba "$spec"
+ec=$?
+
+exit $ec

pyslurm/api.pxd

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from pyslurm cimport slurm

pyslurm/api.pyx

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from pyslurm import settings

pyslurm/core/error.pyx

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from pyslurm.utils cimport cstr

pyslurm/core/job/job.pxd

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from pyslurm.utils cimport cstr, ctime

pyslurm/core/job/job.pyx

@@ -25,7 +25,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from os import WIFSIGNALED, WIFEXITED, WTERMSIG, WEXITSTATUS

pyslurm/core/job/sbatch_opts.pyx

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 import re

pyslurm/core/job/step.pxd

@@ -19,7 +19,7 @@
 # with PySlurm; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# cython: c_string_type=unicode, c_string_encoding=default
+# cython: c_string_type=unicode, c_string_encoding=utf8
 # cython: language_level=3
 
 from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t