From c5da613ec30f052fd3a5e82dceacf0b8429289a0 Mon Sep 17 00:00:00 2001 From: Scott McMillan Date: Fri, 21 Feb 2025 10:15:24 -0600 Subject: [PATCH] Update boost repository location and bump default version --- docs/building_blocks.md | 2 +- hpccm/building_blocks/boost.py | 6 +++--- test/test_boost.py | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/building_blocks.md b/docs/building_blocks.md index 273c5e71..b6a65351 100644 --- a/docs/building_blocks.md +++ b/docs/building_blocks.md @@ -246,7 +246,7 @@ repository. For versions of Boost older than 1.63.0, the SourceForge repository should be used. The default is False. - __version__: The version of Boost source to download. The default -value is `1.76.0`. +value is `1.87.0`. __Examples__ diff --git a/hpccm/building_blocks/boost.py b/hpccm/building_blocks/boost.py index 72f26b83..4f581415 100644 --- a/hpccm/building_blocks/boost.py +++ b/hpccm/building_blocks/boost.py @@ -82,7 +82,7 @@ class boost(bb_base, hpccm.templates.envvars, hpccm.templates.ldconfig, SourceForge repository should be used. The default is False. version: The version of Boost source to download. The default - value is `1.76.0`. + value is `1.87.0`. # Examples @@ -103,14 +103,14 @@ def __init__(self, **kwargs): self.__b2_opts = kwargs.get('b2_opts', []) self.__baseurl = kwargs.get('baseurl', - 'https://boostorg.jfrog.io/artifactory/main/release/__version__/source') + 'https://archives.boost.io/release/__version__/source') self.__bootstrap_opts = kwargs.get('bootstrap_opts', []) self.__ospackages = kwargs.get('ospackages', []) self.__parallel = kwargs.get('parallel', '$(nproc)') self.__prefix = kwargs.get('prefix', '/usr/local/boost') self.__python = kwargs.get('python', False) self.__sourceforge = kwargs.get('sourceforge', False) - self.__version = kwargs.get('version', '1.76.0') + self.__version = kwargs.get('version', '1.87.0') self.__commands = [] # Filled in by __setup() self.__wd = kwargs.get('wd', hpccm.config.g_wd) # working directory diff --git a/test/test_boost.py b/test/test_boost.py index c82a89c3..043bb9ce 100644 --- a/test/test_boost.py +++ b/test/test_boost.py @@ -37,7 +37,7 @@ def test_defaults_ubuntu(self): """Default boost building block""" b = boost() self.assertEqual(str(b), -r'''# Boost version 1.76.0 +r'''# Boost version 1.87.0 RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ bzip2 \ @@ -46,11 +46,11 @@ def test_defaults_ubuntu(self): wget \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \ - mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \ - cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \ + mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \ + cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ ./b2 -j$(nproc) -q install && \ - rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0 + rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0 ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''') @centos @@ -59,7 +59,7 @@ def test_defaults_centos(self): """Default boost building block""" b = boost() self.assertEqual(str(b), -r'''# Boost version 1.76.0 +r'''# Boost version 1.87.0 RUN yum install -y \ bzip2 \ bzip2-devel \ @@ -68,11 +68,11 @@ def test_defaults_centos(self): which \ zlib-devel && \ rm -rf /var/cache/yum/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \ - mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \ - cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \ + mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \ + cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ ./b2 -j$(nproc) -q install && \ - rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0 + rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0 ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''') @ubuntu @@ -90,7 +90,7 @@ def test_python(self): wget \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \ cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost && \ ./b2 -j$(nproc) -q install && \ @@ -134,7 +134,7 @@ def test_ldconfig(self): wget \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2 && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.68.0/source/boost_1_68_0.tar.bz2 && \ mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_68_0.tar.bz2 -C /var/tmp -j && \ cd /var/tmp/boost_1_68_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ ./b2 -j$(nproc) -q install && \ @@ -156,7 +156,7 @@ def test_bootstrap_opts(self): wget \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \ cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=atomic,chrono && \ ./b2 -j$(nproc) -q install && \ @@ -177,7 +177,7 @@ def test_b2_opts(self): wget \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ +RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \ mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \ cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \ ./b2 cxxflags="-std=c++14" -j$(nproc) -q install && \