From 12e80e5489a4c4c12e8ecc28e8bacc0e96ceb046 Mon Sep 17 00:00:00 2001 From: mhucka Date: Thu, 2 Oct 2025 02:08:05 +0000 Subject: [PATCH 1/3] Change Dockerfiles to use cmake 3.28 This matches the recent changes in other files to use cmake 3.28. --- Dockerfile | 4 ++-- install/tests/Dockerfile | 4 ++-- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c83ecb78..6f9b4b9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,8 @@ RUN apt-get update && \ # Ubuntu 24's version of CMake is 3.28. We need a newer version. RUN apt-get remove --purge --auto-remove cmake -RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh && \ - sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license +RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh && \ + sh cmake-3.28.1-linux-x86_64.sh --prefix=/usr/local --skip-license # Copy relevant files for simulation. COPY ./Makefile /qsim/Makefile diff --git a/install/tests/Dockerfile b/install/tests/Dockerfile index b3e51020..e8ffe6cb 100644 --- a/install/tests/Dockerfile +++ b/install/tests/Dockerfile @@ -27,8 +27,8 @@ RUN apt-get update && \ # Ubuntu 24's version of CMake is 3.28. We need a newer version. RUN apt-get remove --purge --auto-remove cmake -RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.sh && \ - sh cmake-3.31.7-linux-x86_64.sh --prefix=/usr/local --skip-license +RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh && \ + sh cmake-3.28.1-linux-x86_64.sh --prefix=/usr/local --skip-license # Copy qsim files from the outside-Docker location to an inside-Docker location. COPY ./ /qsim/ diff --git a/setup.py b/setup.py index 2ad08845..78951bac 100644 --- a/setup.py +++ b/setup.py @@ -47,8 +47,8 @@ def run(self): cmake_version = parse( re.search(r"version\s*([\d.]+)", out.decode()).group(1) ) - if cmake_version < parse("3.31.0"): - raise RuntimeError("CMake >= 3.31.0 is required on Windows") + if cmake_version < parse("3.28.0"): + raise RuntimeError("CMake >= 3.28.0 is required on Windows") for ext in self.extensions: self.build_extension(ext) From 232843782d5c5271dd714f30f07d136034948a2a Mon Sep 17 00:00:00 2001 From: mhucka Date: Thu, 2 Oct 2025 02:52:18 +0000 Subject: [PATCH 2/3] =?UTF-8?q?Update=20more=20instances=20of=20cmake=203.?= =?UTF-8?q?31=20=E2=86=92=203.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some additional Python files need to be changed too. --- dev-requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index bc06679f..3c8503e8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ black~=25.1.0 -cmake~=3.31.0 +cmake~=3.28.0 flynt~=1.0 pytest pytest-xdist diff --git a/setup.py b/setup.py index 78951bac..b36f4b0c 100644 --- a/setup.py +++ b/setup.py @@ -151,7 +151,7 @@ def build_extension(self, ext): "packaging", "setuptools>=75.2.0", "pybind11[global]", - "cmake~=3.31.0", + "cmake~=3.28.0", ], extras_require={ "dev": dev_requirements, From 123349ebd3fd9032654c9cc138ccf8e4d83ec6de Mon Sep 17 00:00:00 2001 From: mhucka Date: Thu, 2 Oct 2025 02:53:38 +0000 Subject: [PATCH 3/3] Use 3.28.1, not 3.28.0, to be consistent everywhere --- dev-requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 3c8503e8..01d6d3a3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ black~=25.1.0 -cmake~=3.28.0 +cmake~=3.28.1 flynt~=1.0 pytest pytest-xdist diff --git a/setup.py b/setup.py index b36f4b0c..74976b03 100644 --- a/setup.py +++ b/setup.py @@ -151,7 +151,7 @@ def build_extension(self, ext): "packaging", "setuptools>=75.2.0", "pybind11[global]", - "cmake~=3.28.0", + "cmake~=3.28.1", ], extras_require={ "dev": dev_requirements,