Skip to content

Commit cb1d1fe

Browse files
github-actions[bot]create-or-update-pull-requestkuelumbus
authored
🤖 Bump RDKit version to Release_2025_09_4 (#145) [skip ci]
* Set RDKit version to Release_2025_09_4 * ci: Update macos-13 to macos-14 (runner retired) * cherry pick fix for macos * ci: update cibuildwheel version to 3.3.1 for wheel builds * deprecate macOS intel * Eigen3 is now available in the windows runner image. --------- Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com> Co-authored-by: Chris Kuenneth <christopher.kuenneth@gmail.com>
1 parent b971fc8 commit cb1d1fe

File tree

5 files changed

+40
-28
lines changed

5 files changed

+40
-28
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==3.1.1
21+
python3 -m pip install cibuildwheel==3.3.1
2222
python3 -m cibuildwheel --output-dir wheelhouse
2323
- store_artifacts:
2424
path: wheelhouse/

.github/workflows/wheels.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -94,26 +94,26 @@ jobs:
9494
platform_id: macosx_arm64
9595

9696
# MacOS 64 bit Intel: x86_64
97-
- os: macos-13
98-
bitness: 64
99-
python: 310
100-
platform_id: macosx_x86_64
101-
- os: macos-13
102-
bitness: 64
103-
python: 311
104-
platform_id: macosx_x86_64
105-
- os: macos-13
106-
bitness: 64
107-
python: 312
108-
platform_id: macosx_x86_64
109-
- os: macos-13
110-
bitness: 64
111-
python: 313
112-
platform_id: macosx_x86_64
113-
- os: macos-13
114-
bitness: 64
115-
python: 314
116-
platform_id: macosx_x86_64
97+
# - os: macos-14
98+
# bitness: 64
99+
# python: 310
100+
# platform_id: macosx_x86_64
101+
# - os: macos-14
102+
# bitness: 64
103+
# python: 311
104+
# platform_id: macosx_x86_64
105+
# - os: macos-14
106+
# bitness: 64
107+
# python: 312
108+
# platform_id: macosx_x86_64
109+
# - os: macos-14
110+
# bitness: 64
111+
# python: 313
112+
# platform_id: macosx_x86_64
113+
# - os: macos-14
114+
# bitness: 64
115+
# python: 314
116+
# platform_id: macosx_x86_64
117117

118118
steps:
119119
- uses: actions/checkout@v4
@@ -158,7 +158,7 @@ jobs:
158158
cd C:\\rdkit
159159
echo "C:\\libs" >> $GITHUB_PATH
160160
fi
161-
python -m pip install cibuildwheel==3.1.1
161+
python -m pip install cibuildwheel==3.3.1
162162
python -m cibuildwheel --output-dir wheelhouse
163163
shell: bash
164164

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Please open an issue if you find something missing or not working as expected.
2222
| ------- | ------- | --- | --------------------------------------------------- | -------------- | --- | ---- | ---- | ---- | ---- | ---- | -------------- |
2323
| Linux | intel | 64 | glibc >= 2.28 (e.g., Ubuntu 18.04+, CentOS 6+, ...) | last: 2024.3.5 | last: 2025.9.2 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2424
| Linux | aarch64 | 64 | glibc >= 2.28 (e.g., Raspberry Pi, ...) | last: 2024.3.5 | last: 2025.9.2 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Circle CI |
25-
| macOS | intel | 64 | >= macOS 10.15 | last: 2024.3.5 | last: 2025.9.2 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
25+
| macOS | intel | 64 | >= macOS 10.15 | last: 2024.3.5 | last: 2025.9.2 | last: 2025.9.4 | last: 2025.9.4 | last: 2025.9.4 | last: 2025.9.4 | last: 2025.9.4 | Github Actions |
2626
| macOS | armv8 | 64 | >= macOS 11, M-Hardware | last: 2024.3.5 | last: 2025.9.2 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2727
| Windows | intel | 64 | | last: 2024.3.5 | last: 2025.9.2 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2828

setup.py

Lines changed: 17 additions & 1 deletion
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_09_3"
15+
rdkit_tag = "Release_2025_09_4"
1616

1717
with open("README.md", "r", encoding="utf-8") as fh:
1818
long_description = fh.read()
@@ -118,6 +118,22 @@ def build_rdkit(self, ext):
118118

119119
# Start build process
120120
os.chdir(str("rdkit"))
121+
if rdkit_tag == "Release_2025_09_4":
122+
# Cherry-pick fix for MolAlign: brace-init BestAlignmentParams in wrapper
123+
# https://github.com/rdkit/rdkit/pull/9042/commits/7c15baca9d662506b61d3395a0d5139be2b67640
124+
check_call(["git", "config", "--global", "user.email", '"you@example.com"'])
125+
check_call(["git", "config", "--global", "user.name", '"Your Name"'])
126+
check_call(["git", "fetch", "origin", "pull/9042/head:pr_9042"])
127+
check_call(
128+
[
129+
"git",
130+
"cherry-pick",
131+
"--strategy=recursive",
132+
"-X",
133+
"theirs",
134+
"7c15baca9d662506b61d3395a0d5139be2b67640",
135+
]
136+
)
121137

122138
# if rdkit_tag == "Release_2025_03_3":
123139
# # https://github.com/rdkit/rdkit/pull/8399/commits/e5b1e3caf0c362139a5905575b5f995c470b9300

vcpkg.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
{
99
"name": "freetype",
1010
"platform": "windows"
11-
},
12-
{
13-
"name": "eigen3",
14-
"platform": "windows"
1511
}
1612
]
1713
}

0 commit comments

Comments
 (0)