Skip to content

Commit bfa256b

Browse files
github-actions[bot]Create or Update Pull Request Actionkuelumbus
authored
🤖 Bump RDKit version to Release_2025_03_3 (#131) [skip ci]
* Set RDKit version to Release_2025_03_3 * Fix and restrict rdkit_tag replacement on first occurrence * Bump to cibuildwheel 3.0.0 * comment cherry picking code * Set RDKit version to Release_2025_03_3 * Revert "Set RDKit version to Release_2025_03_3" This reverts commit 4f0f151. --------- Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com> Co-authored-by: Christopher Kuenneth <christopher.kuenneth@gmail.com>
1 parent f53e790 commit bfa256b

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
CIBW_ARCHS: aarch64
1919

2020
command: |
21-
python3 -m pip install cibuildwheel==2.22.0
21+
python3 -m pip install cibuildwheel==3.0.0
2222
python3 -m cibuildwheel --output-dir wheelhouse
2323
- store_artifacts:
2424
path: wheelhouse/

.github/workflows/check_rdkit_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
rm -fr rdkit
2929
echo "changed=false" >> $GITHUB_OUTPUT
3030
if [[ "$new_tag" != "$current_tag" ]]; then
31-
sed -i "s/rdkit_tag =.*/rdkit_tag = \"$new_tag\"/g" setup.py
31+
sed -i "0,/rdkit_tag/ s/rdkit_tag =.*/rdkit_tag = \"$new_tag\"/g" setup.py
3232
echo "changed=true" >> $GITHUB_OUTPUT
3333
echo "new_tag=${new_tag}" >> $GITHUB_OUTPUT
3434
fi

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
cd C:\\rdkit
159159
echo "C:\\libs" >> $GITHUB_PATH
160160
fi
161-
python -m pip install cibuildwheel==2.22.0
161+
python -m pip install cibuildwheel==3.0.0
162162
python -m cibuildwheel --output-dir wheelhouse
163163
shell: bash
164164

setup.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from setuptools.command.build_ext import build_ext as build_ext_orig
1313

1414
# RDKit version to build (tag from github repository)
15-
rdkit_tag = "Release_2025_03_2"
15+
rdkit_tag = "Release_2025_03_3"
1616

1717
with open("README.md", "r", encoding="utf-8") as fh:
1818
long_description = fh.read()
@@ -156,22 +156,21 @@ def build_rdkit(self, ext):
156156
# Start build process
157157
os.chdir(str("rdkit"))
158158

159-
if rdkit_tag == "Release_2025_03_2":
160-
# https://github.com/rdkit/rdkit/pull/8399/commits/e5b1e3caf0c362139a5905575b5f995c470b9300
161-
check_call(["git", "config", "--global", "user.email", '"you@example.com"'])
162-
check_call(["git", "config", "--global", "user.name", '"Your Name"'])
163-
164-
check_call(["git", "fetch", "origin", "pull/8477/head:tag_release"])
165-
check_call(
166-
[
167-
"git",
168-
"cherry-pick",
169-
"--strategy=recursive",
170-
"-X",
171-
"theirs",
172-
"0b8fc6fbf7bee2a0de34daee6088aeb8c8036272",
173-
]
174-
)
159+
# if rdkit_tag == "Release_2025_03_3":
160+
# # https://github.com/rdkit/rdkit/pull/8399/commits/e5b1e3caf0c362139a5905575b5f995c470b9300
161+
# check_call(["git", "config", "--global", "user.email", '"you@example.com"'])
162+
# check_call(["git", "config", "--global", "user.name", '"Your Name"'])
163+
# check_call(["git", "fetch", "origin", "pull/8477/head:tag_release"])
164+
# check_call(
165+
# [
166+
# "git",
167+
# "cherry-pick",
168+
# "--strategy=recursive",
169+
# "-X",
170+
# "theirs",
171+
# "0b8fc6fbf7bee2a0de34daee6088aeb8c8036272",
172+
# ]
173+
# )
175174

176175
import fileinput
177176

0 commit comments

Comments
 (0)