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/dev-requirements.txt b/dev-requirements.txt index e6999aae..6402543e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ +cmake~=3.28.1 black~=25.9.0 -cmake~=3.31.0 flynt~=1.0 pytest pytest-xdist 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..74976b03 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) @@ -151,7 +151,7 @@ def build_extension(self, ext): "packaging", "setuptools>=75.2.0", "pybind11[global]", - "cmake~=3.31.0", + "cmake~=3.28.1", ], extras_require={ "dev": dev_requirements,