Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

# 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
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
black~=25.1.0
cmake~=3.31.0
cmake~=3.28.1
flynt~=1.0
pytest
pytest-xdist
Expand Down
4 changes: 2 additions & 2 deletions install/tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

# 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/
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
Loading