From 96c76625dee19942a5f070f9b5cedf003fa4846f Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 28 Mar 2025 16:25:55 +0000 Subject: [PATCH 01/18] dev-tools: upgrade easybuild to 5.0.0 Signed-off-by: Adrian Reber (cherry picked from commit ccef77a54ac0e3719c7fd81d203c2fd0b6455d1f) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 6516d1012f..9ea259b07f 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 4.9.4 +Version: 5.0.0 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools @@ -104,13 +104,13 @@ EOF for file in \ easybuild/easyconfigs/p/PyTorch/PyTorch-check-cpp-extension.py \ - easybuild/scripts/bootstrap_eb.py \ easybuild/scripts/clean_gists.py \ easybuild/scripts/findPythonDeps.py \ easybuild/scripts/fix_docs.py \ easybuild/scripts/mk_tmpl_easyblock_for.py \ + lib/python%{python3_version}/site-packages/easybuild/easyblocks/p/pytorch.py \ easybuild/scripts/rpath_args.py; do - sed -e "s,^#\!/usr/bin/env python,#\!/usr/bin/env python3,g" \ + sed -e "s,^#\!\s*/usr/bin/env python,#\!/usr/bin/env python3,g" \ -i %{buildroot}/%{install_path}/${file} done From 96cb3e739038bed32304ae12e2ebbe37bdc72940 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 10 Jul 2025 10:21:41 +0000 Subject: [PATCH 02/18] build: add python3-wheel as build dependency Add python3-wheel as a build dependency to ensure that the package can be built correctly. This is required for newer versions of setuptools. Assisted-by: Gemini 2.5 Flash Signed-off-by: Adrian Reber (cherry picked from commit 2c2767b0adefdb6f9a6296852dd4f5915ce716a4) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 9ea259b07f..9c17747ce6 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -29,6 +29,7 @@ Source2: https://pypi.io/packages/source/e/easybuild-easyconfigs/easybuild_eas Source3: https://pypi.io/packages/source/e/easybuild-framework/easybuild_framework-%{version}.tar.gz BuildRequires: python3-devel python3-pip BuildRequires: python3-setuptools +BuildRequires: python3-wheel Requires: python3 Requires: patch #!BuildIgnore: post-build-checks From 6bac8c9a2bc71ea2e4240967e80d6510a041a222 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 10 Jul 2025 11:02:17 +0000 Subject: [PATCH 03/18] chore(easybuild): bump easybuild version to 5.1.1 Assisted-by: Gemini 2.5 Flash Signed-off-by: Adrian Reber (cherry picked from commit 6665f640ac4218e4ec4b5f67b848904a1a89c2f4) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 9c17747ce6..739881bfe2 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 5.0.0 +Version: 5.1.1 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools From 0767ca5aaa22b34c49f1914305c4f767255a30da Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 9 Oct 2025 18:29:33 +0200 Subject: [PATCH 04/18] update EasyBuild to v5.1.2 Signed-off-by: Kenneth Hoste (cherry picked from commit 8b4e8632cc51c5b7ee75dc0d8b6ea4fe4c62e2c1) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 739881bfe2..2e266e6872 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 5.1.1 +Version: 5.1.2 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools From 2928b9cf53bdb299c79b3e3e44bb52de7535b516 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 24 Dec 2025 09:21:59 +0100 Subject: [PATCH 05/18] update EasyBuild to v5.2.0 Signed-off-by: Kenneth Hoste (cherry picked from commit 4f7f051e844b96afda56da4b03ba102fb91fb3c8) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 2e266e6872..ac61fced1f 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 5.1.2 +Version: 5.2.0 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools From 1d1b896635faa715e992f96035627273851aa277 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 20 Feb 2026 22:07:22 +0100 Subject: [PATCH 06/18] update EasyBuild to v5.2.1 Signed-off-by: Kenneth Hoste (cherry picked from commit d978eadd81c8b0748b0dd4723fe2272c56c77f87) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index ac61fced1f..25a7ab0b5b 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 5.2.0 +Version: 5.2.1 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools From 0168f22604ccbfea232a5492619bd9b07e80af11 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 14 Apr 2026 06:10:29 +0000 Subject: [PATCH 07/18] dev-tools: update easybuild to 5.3.0 - EasyBuild: 5.2.1 -> 5.3.0 upstream: pypi.org/project/easybuild Command: `misc/check_for_package_updates.py -v -o markdown easybuild --update` Signed-off-by: Adrian Reber (cherry picked from commit 49ee7fa72e811628414bad9ed0a34fb24fa3d881) --- components/dev-tools/easybuild/SPECS/easybuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index 25a7ab0b5b..ce15b44b14 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -17,7 +17,7 @@ Summary: Software build and installation framework Name: EasyBuild%{PROJ_DELIM} -Version: 5.2.1 +Version: 5.3.0 Release: %{?dist}.1 License: GPLv2 Group: %{PROJ_NAME}/dev-tools From d3bc54c8721e9f0fbd7fa57dc25784db6d6e7538 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 13:57:50 +0000 Subject: [PATCH 08/18] dev-tools: add multi-distro python support for easybuild Use conditional macros to support both AlmaLinux 8 (python3.12) and Leap 15.5 (python39). Make python-wheel a build dependency only on AlmaLinux since it is unavailable on Leap. Add openssl-devel/libopenssl-devel as a runtime dependency for testing. Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- .../dev-tools/easybuild/SPECS/easybuild.spec | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/components/dev-tools/easybuild/SPECS/easybuild.spec b/components/dev-tools/easybuild/SPECS/easybuild.spec index ce15b44b14..0bdc798b07 100644 --- a/components/dev-tools/easybuild/SPECS/easybuild.spec +++ b/components/dev-tools/easybuild/SPECS/easybuild.spec @@ -27,11 +27,28 @@ Source0: https://pypi.io/packages/source/e/easybuild/easybuild-%{version}.tar. Source1: https://pypi.io/packages/source/e/easybuild-easyblocks/easybuild_easyblocks-%{version}.tar.gz Source2: https://pypi.io/packages/source/e/easybuild-easyconfigs/easybuild_easyconfigs-%{version}.tar.gz Source3: https://pypi.io/packages/source/e/easybuild-framework/easybuild_framework-%{version}.tar.gz -BuildRequires: python3-devel python3-pip -BuildRequires: python3-setuptools -BuildRequires: python3-wheel -Requires: python3 +%if 0%{?suse_version} +%define python_prefix python39 +%define python_bin python3.9 +%define python_ver 3.9 +%else +%define python_prefix python3.12 +%define python_bin python3.12 +%define python_ver 3.12 +%endif + +BuildRequires: %{python_prefix}-devel %{python_prefix}-pip +BuildRequires: %{python_prefix}-setuptools +%if !0%{?suse_version} +BuildRequires: %{python_prefix}-wheel +%endif +Requires: %{python_prefix} Requires: patch +%if 0%{?suse_version} +Requires: libopenssl-devel +%else +Requires: openssl-devel +%endif #!BuildIgnore: post-build-checks # Lmod dependency (note that lmod is pre-populated in the OpenHPC OBS build @@ -56,7 +73,7 @@ systems in an efficient way. %install for eb in framework easyblocks easyconfigs; do cd %{pname}_${eb}-%{version} - pip3 install --prefix=%{install_path} --root=%{buildroot} . + pip%{python_ver} install --prefix=%{install_path} --root=%{buildroot} . cd .. done @@ -87,9 +104,9 @@ module use \$home/.local/easybuild/modules/all setenv EBROOTEASYBUILD %{install_path} setenv EBVERSIONEASYBUILD %{version} -setenv EB_PYTHON python3 +setenv EB_PYTHON %{python_bin} -prepend-path PYTHONPATH %{install_path}/lib/python%{python3_version}/site-packages +prepend-path PYTHONPATH %{install_path}/lib/python%{python_ver}/site-packages EOF @@ -109,9 +126,9 @@ for file in \ easybuild/scripts/findPythonDeps.py \ easybuild/scripts/fix_docs.py \ easybuild/scripts/mk_tmpl_easyblock_for.py \ - lib/python%{python3_version}/site-packages/easybuild/easyblocks/p/pytorch.py \ + lib/python%{python_ver}/site-packages/easybuild/easyblocks/p/pytorch.py \ easybuild/scripts/rpath_args.py; do - sed -e "s,^#\!\s*/usr/bin/env python,#\!/usr/bin/env python3,g" \ + sed -e "s,^#\!\s*/usr/bin/env python,#\!/usr/bin/env %{python_bin},g" \ -i %{buildroot}/%{install_path}/${file} done From a2f697376e78930b5c6078105caff29653f9a527 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 13:59:10 +0000 Subject: [PATCH 09/18] tests: merge easybuild test changes from 4.x Signed-off-by: Adrian Reber --- tests/dev-tools/easybuild/EasyBuild | 52 +++++++++++++++++------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/tests/dev-tools/easybuild/EasyBuild b/tests/dev-tools/easybuild/EasyBuild index 73495ee0bd..74c5c2b9dc 100755 --- a/tests/dev-tools/easybuild/EasyBuild +++ b/tests/dev-tools/easybuild/EasyBuild @@ -4,35 +4,43 @@ load ./common/test_helper_functions || exit 1 source ./common/functions || exit 1 -if [ -s ./common/TEST_ENV ];then - source ./common/TEST_ENV +if [ -s ./common/TEST_ENV ]; then + source ./common/TEST_ENV fi -module load EasyBuild +setup() { + module load EasyBuild +} @test "[EasyBuild] check for RPM" { - run check_if_rpm_installed "EasyBuild${DELIM}" - assert_success + run check_if_rpm_installed "EasyBuild${DELIM}" + assert_success } @test "[EasyBuild] test executable" { - run eb --help - assert_success - run eb --version - assert_success + run eb --help + assert_success + run eb --version + assert_success } -@test "[EasyBuild] quick test install of bzip2" { - EB_TEST_TMPDIR=$(mktemp -d) - export EASYBUILD_PREFIX=$EB_TEST_TMPDIR - eb --show-config - assert_success - eb bzip2-1.0.6.eb - assert_success - module use $EASYBUILD_PREFIX/modules/all - module load bzip2/1.0.6 - assert_success - test -f $EBROOTBZIP2/bin/bzip2 - assert_success - rm -r $EB_TEST_TMPDIR +@test "[EasyBuild] test install of tmux" { + EB_TEST_TMPDIR=$(mktemp -d) + export EASYBUILD_PREFIX="${EB_TEST_TMPDIR}" + eb --show-config + assert_success + eb tmux-3.2a.eb --robot + assert_success + module use "${EASYBUILD_PREFIX}"/modules/all + module load tmux/3.4 + assert_success + test -f "${EBROOTTMUX}"/bin/tmux + assert_success + "${EBROOTTMUX}"/bin/tmux new-session -d + assert_success + "${EBROOTTMUX}"/bin/tmux list-session + assert_success + "${EBROOTTMUX}"/bin/tmux kill-session + assert_success + rm -r "${EB_TEST_TMPDIR}" } From 1c65f79bbb1e36420e3e6b1fbfa5538e5c06c40a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 17:13:01 +0000 Subject: [PATCH 10/18] Make it possible to use `get_source.sh` plugins Backport of 8d1f841eddded654543ef6d6233e2bff81cc0f68. misc/get_source.sh will execute any .../SOURCES/get_source.sh if such exists Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- components/admin/docs/SOURCES/get_source.sh | 31 +++++++++++++++++++++ misc/get_source.sh | 6 ++++ 2 files changed, 37 insertions(+) create mode 100644 components/admin/docs/SOURCES/get_source.sh diff --git a/components/admin/docs/SOURCES/get_source.sh b/components/admin/docs/SOURCES/get_source.sh new file mode 100644 index 0000000000..2f9198c6c7 --- /dev/null +++ b/components/admin/docs/SOURCES/get_source.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# Note: The current working directory is the component's SPEC folder + +# The folder that will contain the .git/ and docs/ folders +DOCS_OHPC_FOLDER=docs-ohpc +# A folder that contains the full Git history of the project +# Full history is needed for the usage of `git archive` command +COMPLETE_OHPC_FOLDER=$(mktemp -d) + +cleanup() { + rm -rf ${DOCS_OHPC_FOLDER} ${COMPLETE_OHPC_FOLDER} +} +trap cleanup EXIT + +# 1. Prepare +cleanup +mkdir -p ${DOCS_OHPC_FOLDER} + +# 2. Fetch the full Git history so that `git describe` works later +git clone https://github.com/openhpc/ohpc ${COMPLETE_OHPC_FOLDER} +cp -r ${COMPLETE_OHPC_FOLDER}/.git ${DOCS_OHPC_FOLDER} + +# 3. Copy the local docs/ +cp -r ../../../../docs ${DOCS_OHPC_FOLDER} + +# 4. Create docs-ohpc.tar +tar cf ../SOURCES/docs-ohpc.tar ${DOCS_OHPC_FOLDER} + +# 5. Cleanup +cleanup diff --git a/misc/get_source.sh b/misc/get_source.sh index 7cfaac7dc4..104439d719 100755 --- a/misc/get_source.sh +++ b/misc/get_source.sh @@ -27,6 +27,12 @@ do DIR=$(dirname "${file}") pushd "${DIR}" > /dev/null || exit 1 + + # .../SOURCES/get_source.sh is an optional "plugin" that could build/fetch component's sources on the fly + if [ -f ../SOURCES/get_source.sh ]; then + bash ../SOURCES/get_source.sh + fi + BASE=$(basename "${file}") SOURCES=$(rpmspec --parse --define '_sourcedir ../../..' "${FLAGS[@]}" "${BASE}" | grep Source) From cbe4883b4d5ef17ee0c2c3b53e1c26b4d8b64b78 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 17:16:52 +0000 Subject: [PATCH 11/18] tests: build docs when install recipes are modified Backport of 6b64be02ec (Build the docs when anything in docs/recipes/install/ is modified) and the tests/ci/run_build.py part of 8d1f841ed (Make it possible to use `get_source.sh` plugins). Adds logic to run_build.py so that docs.spec is built when any file in docs/recipes/install/ or components/admin/docs/SOURCES/ is modified, and ensures it is only built once even if multiple docs files are changed. Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- tests/ci/run_build.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/ci/run_build.py b/tests/ci/run_build.py index 873c316bf1..75307b40bb 100755 --- a/tests/ci/run_build.py +++ b/tests/ci/run_build.py @@ -230,9 +230,23 @@ def build_srpm_and_rpm( failed = [] rebuild_success = [] total = 0 +docs_spec_executed = False for spec in args.specfiles: - if not spec.endswith(".spec"): + # if more than one docs related file are modified then + # build the docs.spec just once + # START OF LOGIC FOR DOCS + if 'components/admin/docs/SPECS/docs.spec' == spec: + if docs_spec_executed: + continue + docs_spec_executed = True + elif not docs_spec_executed and \ + ('docs/recipes/install/' in spec + or 'components/admin/docs/SOURCES/' in spec): + docs_spec_executed = True + spec = 'components/admin/docs/SPECS/docs.spec' + # END OF LOGIC FOR DOCS + elif not spec.endswith(".spec"): continue just_spec = os.path.basename(spec) total += 1 From 9425e6d032a43121ef682da235898ea484758118 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 17:19:32 +0000 Subject: [PATCH 12/18] ci: rebuild test-suite when source files change Backport of the test-suite logic from 01d55b521d. Update run_build.py to trigger a rebuild of tests.spec when files under tests/ or components/admin/test-suite/SOURCES/ change, mirroring the existing docs rebuild logic. Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- tests/ci/run_build.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/ci/run_build.py b/tests/ci/run_build.py index 75307b40bb..a10a059f9d 100755 --- a/tests/ci/run_build.py +++ b/tests/ci/run_build.py @@ -231,6 +231,7 @@ def build_srpm_and_rpm( rebuild_success = [] total = 0 docs_spec_executed = False +tests_spec_executed = False for spec in args.specfiles: # if more than one docs related file are modified then @@ -246,6 +247,17 @@ def build_srpm_and_rpm( docs_spec_executed = True spec = 'components/admin/docs/SPECS/docs.spec' # END OF LOGIC FOR DOCS + # START OF LOGIC FOR TESTS + elif "components/admin/test-suite/SPECS/tests.spec" == spec: + if tests_spec_executed: + continue + tests_spec_executed = True + elif not tests_spec_executed and ( + "tests/" in spec or "components/admin/test-suite/SOURCES/" in spec + ): + tests_spec_executed = True + spec = "components/admin/test-suite/SPECS/tests.spec" + # END OF LOGIC FOR TESTS elif not spec.endswith(".spec"): continue just_spec = os.path.basename(spec) From 01d7782ffd3652f1373cbdbb807de4886e25774f Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 21 May 2026 20:22:24 +0000 Subject: [PATCH 13/18] tests: fix easybuild test deps and tmux version Add ncurses-devel to easybuild test dependencies and fix the tmux module version to 3.2a to match the easyconfig being built. Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- tests/ci/spec_to_test_mapping.py | 2 +- tests/dev-tools/easybuild/EasyBuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ci/spec_to_test_mapping.py b/tests/ci/spec_to_test_mapping.py index a8b67d7309..89975277d8 100755 --- a/tests/ci/spec_to_test_mapping.py +++ b/tests/ci/spec_to_test_mapping.py @@ -33,7 +33,7 @@ "components/dev-tools/easybuild/SPECS/easybuild.spec": [ "easybuild", "", - "gcc-c++", + "gcc-c++ ncurses-devel", ], "components/io-libs/adios/SPECS/adios.spec": ["adios", "", ""], "components/io-libs/hdf5/SPECS/hdf5.spec": ["hdf5", "", "zlib-devel"], diff --git a/tests/dev-tools/easybuild/EasyBuild b/tests/dev-tools/easybuild/EasyBuild index 74c5c2b9dc..88865362ac 100755 --- a/tests/dev-tools/easybuild/EasyBuild +++ b/tests/dev-tools/easybuild/EasyBuild @@ -32,7 +32,7 @@ setup() { eb tmux-3.2a.eb --robot assert_success module use "${EASYBUILD_PREFIX}"/modules/all - module load tmux/3.4 + module load tmux/3.2a assert_success test -f "${EBROOTTMUX}"/bin/tmux assert_success From 972e8d377ee4f8e0e05808405a6cba34a0135c68 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 22 May 2026 06:29:28 +0000 Subject: [PATCH 14/18] docs: require make to build docs Signed-off-by: Adrian Reber --- components/admin/docs/SPECS/docs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/admin/docs/SPECS/docs.spec b/components/admin/docs/SPECS/docs.spec index e64376be23..73ba903ccf 100644 --- a/components/admin/docs/SPECS/docs.spec +++ b/components/admin/docs/SPECS/docs.spec @@ -11,7 +11,7 @@ %include %{_sourcedir}/OHPC_macros Name: docs%{PROJ_DELIM} -Version: 2.9.0 +Version: 2.10.0 Release: 1 Summary: OpenHPC documentation License: BSD-3-Clause @@ -20,6 +20,7 @@ URL: https://github.com/openhpc/ohpc Source0: docs-ohpc.tar BuildRequires: git +BuildRequires: make BuildRequires: texlive-latex BuildRequires: texlive-caption BuildRequires: texlive-colortbl From ce08ae675a445dd55163b17b24e34ee1b857b45d Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 4 Oct 2024 23:10:34 +0300 Subject: [PATCH 15/18] Add get_source.sh for admin/test-suite component Signed-off-by: Martin Tzvetanov Grigorov (cherry picked from commit c8c3da5e29adaa07a0a98c319b315e8fd9d50f4f) --- .../admin/test-suite/SOURCES/get_source.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 components/admin/test-suite/SOURCES/get_source.sh diff --git a/components/admin/test-suite/SOURCES/get_source.sh b/components/admin/test-suite/SOURCES/get_source.sh new file mode 100644 index 0000000000..d0bd95a62c --- /dev/null +++ b/components/admin/test-suite/SOURCES/get_source.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +set -xe + +# Note: The current working directory is the component's SPEC folder +OHPC_ROOT_FOLDER="../../../.." + +# The folder that will contain the .git/ and docs/ folders +TESTS_OHPC_FOLDER=tests-ohpc + +cleanup() { + rm -rf ${TESTS_OHPC_FOLDER} +} +trap cleanup EXIT + +# 1. Prepare +cleanup +mkdir -p ${TESTS_OHPC_FOLDER} + +# 2. Copy the local docs/ +cp -r ${OHPC_ROOT_FOLDER}/tests ${TESTS_OHPC_FOLDER} + +# 3. Create tests-ohpc.tar +tar cf ../SOURCES/tests-ohpc.tar ${TESTS_OHPC_FOLDER} From 7fe884b995cb1facb14f842e8a479edd81e56490 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 4 Oct 2024 23:48:43 +0300 Subject: [PATCH 16/18] docs & test-suite: shellcheck lint the get_source.sh scripts Signed-off-by: Martin Tzvetanov Grigorov (cherry picked from commit 095a8f384c372d9a324b68e346b3715ff3c9922d) --- components/admin/docs/SOURCES/get_source.sh | 16 +++++++++------- .../admin/test-suite/SOURCES/get_source.sh | 8 ++++---- tests/ci/Makefile | 2 ++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/components/admin/docs/SOURCES/get_source.sh b/components/admin/docs/SOURCES/get_source.sh index 2f9198c6c7..3969e67334 100644 --- a/components/admin/docs/SOURCES/get_source.sh +++ b/components/admin/docs/SOURCES/get_source.sh @@ -1,31 +1,33 @@ #!/usr/bin/env bash +set -xe + # Note: The current working directory is the component's SPEC folder # The folder that will contain the .git/ and docs/ folders -DOCS_OHPC_FOLDER=docs-ohpc +DOCS_OHPC_FOLDER="docs-ohpc" # A folder that contains the full Git history of the project # Full history is needed for the usage of `git archive` command COMPLETE_OHPC_FOLDER=$(mktemp -d) cleanup() { - rm -rf ${DOCS_OHPC_FOLDER} ${COMPLETE_OHPC_FOLDER} + rm -rf "${DOCS_OHPC_FOLDER}" "${COMPLETE_OHPC_FOLDER}" } trap cleanup EXIT # 1. Prepare cleanup -mkdir -p ${DOCS_OHPC_FOLDER} +mkdir -p "${DOCS_OHPC_FOLDER}" # 2. Fetch the full Git history so that `git describe` works later -git clone https://github.com/openhpc/ohpc ${COMPLETE_OHPC_FOLDER} -cp -r ${COMPLETE_OHPC_FOLDER}/.git ${DOCS_OHPC_FOLDER} +git clone https://github.com/openhpc/ohpc "${COMPLETE_OHPC_FOLDER}" +cp -r "${COMPLETE_OHPC_FOLDER}/.git" "${DOCS_OHPC_FOLDER}" # 3. Copy the local docs/ -cp -r ../../../../docs ${DOCS_OHPC_FOLDER} +cp -r ../../../../docs "${DOCS_OHPC_FOLDER}" # 4. Create docs-ohpc.tar -tar cf ../SOURCES/docs-ohpc.tar ${DOCS_OHPC_FOLDER} +tar cf ../SOURCES/docs-ohpc.tar "${DOCS_OHPC_FOLDER}" # 5. Cleanup cleanup diff --git a/components/admin/test-suite/SOURCES/get_source.sh b/components/admin/test-suite/SOURCES/get_source.sh index d0bd95a62c..88b39d2421 100644 --- a/components/admin/test-suite/SOURCES/get_source.sh +++ b/components/admin/test-suite/SOURCES/get_source.sh @@ -9,16 +9,16 @@ OHPC_ROOT_FOLDER="../../../.." TESTS_OHPC_FOLDER=tests-ohpc cleanup() { - rm -rf ${TESTS_OHPC_FOLDER} + rm -rf "${TESTS_OHPC_FOLDER}" } trap cleanup EXIT # 1. Prepare cleanup -mkdir -p ${TESTS_OHPC_FOLDER} +mkdir -p "${TESTS_OHPC_FOLDER}" # 2. Copy the local docs/ -cp -r ${OHPC_ROOT_FOLDER}/tests ${TESTS_OHPC_FOLDER} +cp -r "${OHPC_ROOT_FOLDER}/tests" "${TESTS_OHPC_FOLDER}" # 3. Create tests-ohpc.tar -tar cf ../SOURCES/tests-ohpc.tar ${TESTS_OHPC_FOLDER} +tar cf ../SOURCES/tests-ohpc.tar "${TESTS_OHPC_FOLDER}" diff --git a/tests/ci/Makefile b/tests/ci/Makefile index 7af8837169..3637880948 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -45,6 +45,8 @@ shellcheck-lint: ../../misc/shell-functions \ ../../tests/ci/prepare-ci-environment.sh \ ../../tests/ci/setup_slurm_and_run_tests.sh \ + ../../components/admin/docs/SOURCES/get_source.sh \ + ../../components/admin/test-suite/SOURCES/get_source.sh \ ../../tests/libs/netcdf/ohpc-tests/netcdf_all_test_mpi_families \ ../../tests/libs/netcdf/ohpc-tests/test_mpi_families \ ../../components/OHPC_setup_mpi \ From c8dbe3f85de1ff9a4fb8426f4165b61eaa7f60af Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 4 May 2026 13:36:55 +0000 Subject: [PATCH 17/18] ci: make sure all leap repositories are refreshed Signed-off-by: Adrian Reber (cherry picked from commit 4fd314ddb3c3486fc0f0f43049933aac495cbda9) --- .github/workflows/validate.yml | 2 + components/distro-packages/psqlodbc/LICENSE | 502 ------------------ .../psqlodbc/SOURCES/rpmlintrc | 1 - .../psqlodbc/SPECS/psqlODBC.spec | 99 ---- .../distro-packages/python-setuptools/LICENSE | 59 -- .../SOURCES/fix-sle11-test-failure.patch | 11 - .../python-setuptools/SOURCES/psfl.txt | 216 -------- .../setuptools-5.4.1-create-sitedir.patch | 16 - .../SPECS/python-setuptools.spec | 92 ---- 9 files changed, 2 insertions(+), 996 deletions(-) delete mode 100644 components/distro-packages/psqlodbc/LICENSE delete mode 100644 components/distro-packages/psqlodbc/SOURCES/rpmlintrc delete mode 100644 components/distro-packages/psqlodbc/SPECS/psqlODBC.spec delete mode 100644 components/distro-packages/python-setuptools/LICENSE delete mode 100644 components/distro-packages/python-setuptools/SOURCES/fix-sle11-test-failure.patch delete mode 100644 components/distro-packages/python-setuptools/SOURCES/psfl.txt delete mode 100644 components/distro-packages/python-setuptools/SOURCES/setuptools-5.4.1-create-sitedir.patch delete mode 100644 components/distro-packages/python-setuptools/SPECS/python-setuptools.spec diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index d9872a7d54..8f5f27da01 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -111,6 +111,7 @@ jobs: - name: Validate Build run: | . /etc/profile.d/lmod.sh + zypper --no-gpg-checks refresh tests/ci/run_build.py ohpc ${{ steps.files.outputs.added_modified }} touch /tmp/empty - uses: actions/upload-artifact@v7 @@ -153,6 +154,7 @@ jobs: sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true - name: Run CI Tests run: | + zypper --no-gpg-checks refresh export SKIP_CI_SPECS="${{ env.SKIP_CI_SPECS }}${{ env.JOB_SKIP_CI_SPECS }}" . /etc/profile.d/lmod.sh chown ohpc -R tests diff --git a/components/distro-packages/psqlodbc/LICENSE b/components/distro-packages/psqlodbc/LICENSE deleted file mode 100644 index 4362b49151..0000000000 --- a/components/distro-packages/psqlodbc/LICENSE +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/components/distro-packages/psqlodbc/SOURCES/rpmlintrc b/components/distro-packages/psqlodbc/SOURCES/rpmlintrc deleted file mode 100644 index e49787b2a0..0000000000 --- a/components/distro-packages/psqlodbc/SOURCES/rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("library-without-ldconfig-postin") diff --git a/components/distro-packages/psqlodbc/SPECS/psqlODBC.spec b/components/distro-packages/psqlodbc/SPECS/psqlODBC.spec deleted file mode 100644 index 37b2da38d6..0000000000 --- a/components/distro-packages/psqlodbc/SPECS/psqlODBC.spec +++ /dev/null @@ -1,99 +0,0 @@ -#----------------------------------------------------------------------------bh- -# This RPM .spec file is part of the OpenHPC project. -# -# It may have been modified from the default version supplied by the underlying -# release package (if available) in order to apply patches, perform customized -# build/install configurations, and supply additional files to support -# desired integration conventions. -# -#----------------------------------------------------------------------------eh- - -%define pname psqlODBC -%define tarname psqlodbc - -Name: %{pname}%{PROJ_DELIM} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -%if 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: libtool-ltdl -Requires: libtool-ltdl -%endif -BuildRequires: openssl-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel - -%if 0%{?suse_version} == 1315 -Requires: libltdl7 -%endif - -Url: http://pgfoundry.org/projects/psqlodbc - -Summary: ODBC Driver for PostgreSQL -License: LGPL-2.1+ -Group: %{PROJ_NAME}/distro-packages -Version: 09.03.0400 -Release: 33.1 -Source0: %tarname-%{version}.tar.gz -PreReq: /usr/bin/odbcinst -Obsoletes: pg_odbc -Obsoletes: postgresql-odbc -Provides: pg_iface:/usr/lib/pgsql/odbcinst.ini -Provides: pg_odbc -Provides: postgresql-odbc - - - -%description -This package contains the ODBC (Open DataBase Connectivity) driver and -sample configuration files needed for applications to access a -PostgreSQL database using ODBC. - - - -Authors: --------- - Dave Page - Peter Eisentraut - Ludek Finstrle - Bruce Momjian - Anoop Kumar - Hiroshi Saito - -%prep -%setup -q -n %tarname-%version - -%build -autoreconf -fi -# they don't ship configure.in, so we have to patch configure :( -sed -i '/LDFLAGS=/s/\$pg_libs//' configure -export CFLAGS="%optflags -fno-strict-aliasing -I/usr/include/pgsql" -%configure --with-unixodbc || { cat config.log && exit 1; } - -%install -make DESTDIR=%buildroot install -rm -f %buildroot%_libdir/*.la - -%post -/sbin/ldconfig -# odbcinst uses reference counting, so we don't -# need to take care for the update case here. -odbcinst -i -l -d %_libdir/psqlodbcw.so -r < Date: Fri, 22 May 2026 08:19:45 +0000 Subject: [PATCH 18/18] tests: apply ruff format to run_build.py Generated with Claude Code (https://claude.ai/code) Signed-off-by: Adrian Reber --- tests/ci/run_build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/ci/run_build.py b/tests/ci/run_build.py index a10a059f9d..9df1f54514 100755 --- a/tests/ci/run_build.py +++ b/tests/ci/run_build.py @@ -237,15 +237,15 @@ def build_srpm_and_rpm( # if more than one docs related file are modified then # build the docs.spec just once # START OF LOGIC FOR DOCS - if 'components/admin/docs/SPECS/docs.spec' == spec: + if "components/admin/docs/SPECS/docs.spec" == spec: if docs_spec_executed: continue docs_spec_executed = True - elif not docs_spec_executed and \ - ('docs/recipes/install/' in spec - or 'components/admin/docs/SOURCES/' in spec): + elif not docs_spec_executed and ( + "docs/recipes/install/" in spec or "components/admin/docs/SOURCES/" in spec + ): docs_spec_executed = True - spec = 'components/admin/docs/SPECS/docs.spec' + spec = "components/admin/docs/SPECS/docs.spec" # END OF LOGIC FOR DOCS # START OF LOGIC FOR TESTS elif "components/admin/test-suite/SPECS/tests.spec" == spec: