Accepting request 1287999 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/1287999
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/clustershell?expand=0&rev=12

ClusterShell-1.9.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aec17f1c6e063410be378f5bfac0ced80c942351b8e3024d054c1034fcd2843d
-size 400880

ClusterShell-1.9.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e284c0e6b3fe0a0cd6be67df71dfbf6aa321188973db683a057f5637552fbc8c
+size 417135

clustershell.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Jun 16 12:24:50 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+
+- Update to 1.9.3
+  * Fix few typos in ChangeLog found by codespell
+  * Corrects a typo found by typos [1]
+  * Update clush.rst to fix broken URL for llnl.gov pdsh page
+  * Tree: use set instead of NodeSet for gwtargets tracking
+  * Additional Slurm example bindings
+  * Additional Slurm binding for mapping nodes to reservations
+  * GitHub Actions: test also with Python 3.12
+  * GitHub Actions: update actions to their latest versions
+  * Fix tests for libexpat >=2.6.0 (or with CVE-2023-52425 fixes backported)
+  * Communication: sax parser: add flush() after feed()
+  * CLI/Nodeset: omit @source: prefix for cluset -s source -L
+  * GitHub Actions: add Python 3.13
+  * bash completions
+  * Release 1.9.3
+  * Bump pillow from 5.4.1 to 10.3.0 in /doc/sphinx
+- convert to pip-based build
+- remove obsolete python2 subpackage
+
 -------------------------------------------------------------------
 Mon Oct  2 07:19:28 UTC 2023 - Stephane Thiell <sthiell@stanford.edu>
 

clustershell.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package clustershell
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2023 Stephane Thiell <sthiell@stanford.edu>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,32 +17,10 @@
 #
 
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
-%{!?__python: %global __python python}
-%{!?__python2: %global __python2 %{__python}}
-
-%if 0%{?sle_version} && 0%{?sle_version} < 150400
-%define py2 1
-%endif
-
-%if 0%{?suse_version} >= 1500
-%{!?python2_pkgversion: %global python2_pkgversion 2}
-%global python2_pkgprefix python%{python2_pkgversion}
-%else
-%global python2_pkgprefix python
-%endif
-
-%{!?python3_pkgversion: %global python3_pkgversion 3}
-%global python3_pkgprefix python%{python3_pkgversion}
-
-%{!?__python3: %global __python3 python3}
-%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
-
 %global srcname ClusterShell
-
+%define pythons python3
 Name:           clustershell
-Version:        1.9.2
+Version:        1.9.3
 Release:        1%{?dist}
 Summary:        Python framework for efficient cluster administration
 License:        LGPL-2.1-or-later
@@ -51,11 +29,7 @@ Group:          Productivity/Clustering/Computing
 URL:            http://cea-hpc.github.io/clustershell/
 Source0:        https://files.pythonhosted.org/packages/source/C/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
-%if 0%{?py2}
-Requires:       python2-%{name} = %{version}-%{release}
-%else
 Requires:       python3-%{name} = %{version}-%{release}
-%endif
 Requires:       vim
 BuildRequires:  fdupes
 BuildRequires:  vim
@@ -71,56 +45,28 @@ server farms. Command line utilities like clush, clubak and nodeset (or
 cluset) allow traditional shell scripts to take benefit of the features
 offered by the library.
 
-%if 0%{?py2}
+%package -n python3-%{name}
-%package -n python2-%{name}
-Summary:        ClusterShell module for Python 2
-Group:          Productivity/Clustering/Computing
-BuildRequires:  %{python2_pkgprefix}-devel
-BuildRequires:  %{python2_pkgprefix}-setuptools
-Requires:       %{python2_pkgprefix}-setuptools
-%if 0%{?suse_version}
-Requires:       %{python2_pkgprefix}-PyYAML
-%else
-Requires:       PyYAML
-%endif
-%{?python_provide:%python_provide python2-%{name}}
-
-%description -n python2-%{name}
-ClusterShell Python 2 module and related command line tools.
-%endif
-
-%package -n %{python3_pkgprefix}-%{name}
 Summary:        ClusterShell module for Python 3
 Group:          Productivity/Clustering/Computing
-BuildRequires:  %{python3_pkgprefix}-devel
+BuildRequires:  %{python_module devel}
-BuildRequires:  %{python3_pkgprefix}-setuptools
+BuildRequires:  %{python_module pip}
-Requires:       %{python3_pkgprefix}-PyYAML
+BuildRequires:  %{python_module setuptools}
-Requires:       %{python3_pkgprefix}-setuptools
+BuildRequires:  %{python_module wheel}
+Requires:       python3-PyYAML
 %{!?py2:Obsoletes:      python2-%{name}}
 %{?python_provide:%python_provide %{python3_pkgprefix}-%{srcname}}
 
-%description -n %{python3_pkgprefix}-%{name}
+%description -n python3-%{name}
 ClusterShell Python 3 module and related command line tools.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -p1 -n %{srcname}-%{version}
 
 %build
-%{__python3} setup.py build
+%pyproject_wheel
-%{?py2:%{__python2} setup.py build}
 
 %install
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%pyproject_install
-
-%if 0%{?py2}
-pushd %{buildroot}%{_bindir}
-for i in clubak cluset clush nodeset; do
-  mv $i $i-%{python3_shortver}
-done
-popd
-
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
-%endif
 
 # move config dir away from default setuptools /usr prefix (if rpm-building as user)
 [ -d %{buildroot}/usr/etc ] && mv %{buildroot}/usr/etc %{buildroot}/%{_sysconfdir}
@@ -143,41 +89,17 @@ install -p -m 0644 doc/extras/vim/syntax/clushconf.vim %{buildroot}/%{vimdatadir
 install -p -m 0644 doc/extras/vim/syntax/groupsconf.vim %{buildroot}/%{vimdatadir}/syntax/
 %fdupes %{buildroot}
 
-%if 0%{?py2}
+%files -n python3-%{name}
-%files -n python2-%{name}
 %{_bindir}/clubak
 %{_bindir}/cluset
 %{_bindir}/clush
 %{_bindir}/nodeset
-%{python2_sitelib}/ClusterShell/
+%{python3_sitelib}/[Cc]luster[Ss]hell/
-%{python2_sitelib}/ClusterShell-*-py?.?.egg-info
+%{python3_sitelib}/[Cc]luster[Ss]hell-%{version}.dist-info
-
-%files -n %{python3_pkgprefix}-%{name}
-%{_bindir}/clubak-%{python3_shortver}
-%{_bindir}/cluset-%{python3_shortver}
-%{_bindir}/clush-%{python3_shortver}
-%{_bindir}/nodeset-%{python3_shortver}
-%{python3_sitelib}/ClusterShell/
-%{python3_sitelib}/ClusterShell-*-py?.*.egg-info
-
-%else
-
-%files -n %{python3_pkgprefix}-%{name}
-%{_bindir}/clubak
-%{_bindir}/cluset
-%{_bindir}/clush
-%{_bindir}/nodeset
-%{python3_sitelib}/ClusterShell/
-%{python3_sitelib}/ClusterShell-*-py?.*.egg-info
-%endif
 
 %files
 %doc ChangeLog README.md
-%if 0%{?suse_version} >= 1500
 %license COPYING.LGPLv2.1
-%else
-%doc COPYING.LGPLv2.1
-%endif
 %doc doc/examples
 %doc doc/sphinx
 %{_mandir}/man1/clubak.1*