Skip to content

Commit 1989a31

Browse files
github-actions[bot]create-or-update-pull-requestkuelumbus
authored
🤖 Bump RDKit version to Release_2025_03_1 (#129) [skip ci]
* Set RDKit version to Release_2025_03_1 * Switch to windows 2022 GH runners * Cherry pick fix from rdkit --------- 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 35d7d21 commit 1989a31

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/workflows/wheels.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ jobs:
2626
matrix:
2727
include:
2828
# Window 64 bit
29-
- os: windows-2019
29+
- os: windows-2022
3030
python: 39
3131
bitness: 64
3232
platform_id: win_amd64
33-
- os: windows-2019
33+
- os: windows-2022
3434
python: 310
3535
bitness: 64
3636
platform_id: win_amd64
37-
- os: windows-2019
37+
- os: windows-2022
3838
python: 311
3939
bitness: 64
4040
platform_id: win_amd64
41-
- os: windows-2019
41+
- os: windows-2022
4242
python: 312
4343
bitness: 64
4444
platform_id: win_amd64
45-
- os: windows-2019
45+
- os: windows-2022
4646
python: 313
4747
bitness: 64
4848
platform_id: win_amd64

setup.py

Lines changed: 18 additions & 2 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_2024_09_6"
15+
rdkit_tag = "Release_2025_03_1"
1616

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

159-
159+
if rdkit_tag == "Release_2025_03_1":
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/8399/head:tag_release"])
165+
check_call(
166+
[
167+
"git",
168+
"cherry-pick",
169+
"--strategy=recursive",
170+
"-X",
171+
"theirs",
172+
"e5b1e3caf0c362139a5905575b5f995c470b9300",
173+
]
174+
)
175+
160176
import fileinput
161177

162178
def replace_all(file, search_exp, replace_exp):

0 commit comments

Comments
 (0)