Skip to content

Commit 64f3721

Browse files
committed
Set pybind11 minimum version manually
1 parent f7df180 commit 64f3721

3 files changed

Lines changed: 27 additions & 24 deletions

File tree

Tools/Release/update_dependencies.py

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,28 +150,31 @@ def update(args):
150150
dependencies_data[f"commit_{repo_name}"] = new_commit_sha
151151

152152
# update version
153-
print(f"- old version: {dependencies_data[version_key]}")
154-
print(f"- new version: {repo_version_tag}")
155-
if dependencies_data[version_key] == repo_version_tag:
156-
print("Skipping version update...")
153+
if repo_name == "pybind11":
154+
print("Skipping version update... (minimum version set manually)")
157155
else:
158-
print("Updating version...")
159-
dependencies_data[f"version_{repo_name}"] = repo_version_tag
156+
print(f"- old version: {dependencies_data[version_key]}")
157+
print(f"- new version: {repo_version_tag}")
158+
if dependencies_data[version_key] == repo_version_tag:
159+
print("Skipping version update...")
160+
else:
161+
print("Updating version...")
162+
dependencies_data[f"version_{repo_name}"] = repo_version_tag
160163

161-
# update PICMI version in requirements.txt files manually
162-
if repo_name == "picmi":
163-
files = [
164-
os.path.join(repo_dir, "requirements.txt"),
165-
os.path.join(repo_dir, "Docs", "requirements.txt"),
166-
]
167-
for filename in files:
168-
with open(filename) as f:
169-
lines = f.readlines()
170-
with open(filename, "w") as f:
171-
for line in lines:
172-
if line.startswith("picmistandard=="):
173-
line = f"picmistandard=={repo_version_tag}\n"
174-
f.write(line)
164+
# update PICMI version in requirements.txt files manually
165+
if repo_name == "picmi":
166+
files = [
167+
os.path.join(repo_dir, "requirements.txt"),
168+
os.path.join(repo_dir, "Docs", "requirements.txt"),
169+
]
170+
for filename in files:
171+
with open(filename) as f:
172+
lines = f.readlines()
173+
with open(filename, "w") as f:
174+
for line in lines:
175+
if line.startswith("picmistandard=="):
176+
line = f"picmistandard=={repo_version_tag}\n"
177+
f.write(line)
175178

176179
# write to JSON file with dependencies data
177180
with open(dependencies_file, "w") as file:

cmake/dependencies/pybind11.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function(find_pybind11)
3737
mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11)
3838
endif()
3939
else()
40-
find_package(pybind11 ${pybind11_version} CONFIG REQUIRED)
40+
find_package(pybind11 ${pybind11_version_min} CONFIG REQUIRED)
4141
message(STATUS "pybind11: Found version '${pybind11_VERSION}'")
4242
endif()
4343
endfunction()
@@ -55,11 +55,11 @@ set(WarpX_pybind11_repo "https://github.com/pybind/pybind11.git"
5555

5656
# Parse pybind11 version and commit information
5757
file(READ "${WarpX_SOURCE_DIR}/dependencies.json" dependencies_data)
58-
string(JSON pybind11_version GET "${dependencies_data}" version_pybind11)
58+
string(JSON pybind11_version_min GET "${dependencies_data}" version_pybind11_min)
5959
string(JSON pybind11_commit GET "${dependencies_data}" commit_pybind11)
6060

6161
# Strip "v" prefix from version for find_package
62-
string(REGEX REPLACE "^v" "" pybind11_version "${pybind11_version}")
62+
string(REGEX REPLACE "^v" "" pybind11_version_min "${pybind11_version_min}")
6363

6464
set(WarpX_pybind11_branch ${pybind11_commit}
6565
CACHE STRING

dependencies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version_amrex": "26.04",
44
"version_pyamrex": "26.04",
55
"version_picsar": "25.06",
6-
"version_pybind11": "v3.0.4",
6+
"version_pybind11_min": "v3.0.0",
77
"version_picmi": "0.34.0",
88
"commit_amrex": "7e9ce72d229c5316e46f18fe826dfe2adffe7e17",
99
"commit_pyamrex": "1ef54dc9707b8cee69d13c7e3738639bf20f0db2",

0 commit comments

Comments
 (0)