Skip to content

Commit 057ceae

Browse files
github-actions[bot]Create or Update Pull Request Actionkuelumbus
authored
🤖 Bump RDKit version to Release_2025_03_4 (#133) [skip ci]
* Set RDKit version to Release_2025_03_4 * Change directory here to prevent circular imports * Fix stubs * Bump cibuidlwheel * Enable Python 3.14 builds * Add 3.14 and typos. [skip ci] * Fix build error for arm64 on MacOS --------- Co-authored-by: Create or Update Pull Request Action <[email protected]> Co-authored-by: Christopher Kuenneth <[email protected]>
1 parent bfa256b commit 057ceae

File tree

5 files changed

+33
-16
lines changed

5 files changed

+33
-16
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
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.0.0
21+
python3 -m pip install cibuildwheel==3.1.1
2222
python3 -m cibuildwheel --output-dir wheelhouse
2323
- store_artifacts:
2424
path: wheelhouse/
@@ -51,7 +51,7 @@ workflows:
5151
- linux-arm64-wheels:
5252
matrix:
5353
parameters:
54-
python-version: ["39", "310", "311", "312", "313"]
54+
python-version: ["39", "310", "311", "312", "313", "314"]
5555
# - osx-wheels:
5656
# matrix:
5757
# parameters:

.github/workflows/wheels.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ jobs:
4646
python: 313
4747
bitness: 64
4848
platform_id: win_amd64
49+
- os: windows-2022
50+
python: 314
51+
bitness: 64
52+
platform_id: win_amd64
4953

5054
# Linux 64 bit Intel: x86_64
5155
- os: ubuntu-latest
@@ -68,6 +72,10 @@ jobs:
6872
python: 313
6973
bitness: 64
7074
platform_id: manylinux_x86_64
75+
- os: ubuntu-latest
76+
python: 314
77+
bitness: 64
78+
platform_id: manylinux_x86_64
7179

7280
# Linux 64 bit ARM: aarch64 (on Circle CI)
7381

@@ -92,6 +100,10 @@ jobs:
92100
bitness: 64
93101
python: 313
94102
platform_id: macosx_arm64
103+
- os: macos-14
104+
bitness: 64
105+
python: 314
106+
platform_id: macosx_arm64
95107

96108
# MacOS 64 bit Intel: x86_64
97109
- os: macos-13
@@ -114,6 +126,10 @@ jobs:
114126
bitness: 64
115127
python: 313
116128
platform_id: macosx_x86_64
129+
- os: macos-13
130+
bitness: 64
131+
python: 314
132+
platform_id: macosx_x86_64
117133

118134
steps:
119135
- uses: actions/checkout@v4
@@ -158,7 +174,7 @@ jobs:
158174
cd C:\\rdkit
159175
echo "C:\\libs" >> $GITHUB_PATH
160176
fi
161-
python -m pip install cibuildwheel==3.0.0
177+
python -m pip install cibuildwheel==3.1.1
162178
python -m cibuildwheel --output-dir wheelhouse
163179
shell: bash
164180

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Please open an issue if you find something missing or not working as expected.
1818
![GitHub Repo stars](https://img.shields.io/github/stars/kuelumbus/rdkit-pypi?style=for-the-badge&logo=github)
1919
## Available Builds
2020

21-
| OS | Arch | Bit | Conditions | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | 3.13 | CI |
22-
| ------- | ------- | --- | --------------------------------------------------- | -------------- | --- | ---- | ---- | ---- | ---- | -------------- |
23-
| Linux | intel | 64 | glibc >= 2.28 (e.g., Ubuntu 18.04+, CentOS 6+, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
24-
| Linux | aarch64 | 64 | glibc >= 2.28 (e.g., Raspberry Pi, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Circle CI |
25-
| macOS | intel | 64 | >= macOS 10.15 | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
26-
| macOS | armv8 | 64 | >= macOS 11, M1 hardware | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
27-
| Windows | intel | 64 | | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
21+
| OS | Arch | Bit | Conditions | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | 3.13 | 3.14 | CI |
22+
| ------- | ------- | --- | --------------------------------------------------- | -------------- | --- | ---- | ---- | ---- | ---- | ---- | -------------- |
23+
| Linux | intel | 64 | glibc >= 2.28 (e.g., Ubuntu 18.04+, CentOS 6+, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
24+
| Linux | aarch64 | 64 | glibc >= 2.28 (e.g., Raspberry Pi, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Circle CI |
25+
| macOS | intel | 64 | >= macOS 10.15 | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
26+
| macOS | armv8 | 64 | >= macOS 11, M-Hardware | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
27+
| Windows | intel | 64 | | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2828

2929
## Installation
3030

@@ -55,4 +55,4 @@ cd rdkit-pypi
5555
CIBW_BUILD=cp39-manylinux_x86_64 python3 -m cibuildwheel --platform linux --output-dir wheelhouse --config-file pyproject.toml
5656
```
5757

58-
Replace `cp39-manylinux_x86_64` with `cp310-manylinux_x86_64`, `cp311-manylinux_x86_64`, or `cp312-manylinux_x86_64` to build for different Python
58+
Replace `cp39-manylinux_x86_64` with `cp310-manylinux_x86_64`, `cp311-manylinux_x86_64`, `cp312-manylinux_x86_64`, `cp313-manylinux_x86_64`, or `cp314-manylinux_x86_64` to build for different Python

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ build-backend = "setuptools.build_meta"
1313

1414
[tool.cibuildwheel]
1515

16-
build-verbosity = "1"
17-
# build-frontend = { name = "build[uv]"}
16+
build-verbosity = 1
1817
# test
1918
test-requires = "pytest"
2019
test-command = "pytest --exitfirst --verbose --failed-first {package}/tests"
@@ -24,6 +23,7 @@ test-command = "pytest --exitfirst --verbose --failed-first {package}/tests"
2423
manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64:latest"
2524
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64:latest"
2625

26+
build-frontend = { name = "pip", args = ["--no-clean"] }
2727

2828
[tool.cibuildwheel.linux]
2929
before-all = [

setup.py

Lines changed: 4 additions & 3 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_3"
15+
rdkit_tag = "Release_2025_03_4"
1616

1717
with open("README.md", "r", encoding="utf-8") as fh:
1818
long_description = fh.read()
@@ -294,10 +294,10 @@ def to_win_path(pt: Path):
294294
f"-DCMAKE_OSX_ARCHITECTURES=arm64",
295295
f"-DCMAKE_VERBOSE_MAKEFILE=ON" # Increase verbosity
296296
]
297-
# for python 3.13 macOS ARM64, 'CFLAGS', 'LDFLAGS', 'LDSHARED', 'BLDSHARED' contains '-arch x86_64'
297+
# for python 3.13 and 3.14 macOS ARM64, 'CFLAGS', 'LDFLAGS', 'LDSHARED', 'BLDSHARED' contains '-arch x86_64'
298298
# see https://github.com/rdkit/rdkit/blob/498f57a4eb99a67d842cbc3f89f94b302f398a11/CMakeLists.txt#L376C59-L376C95
299299
# remove "-arch x86_64" from PYTHON_LDSHARED
300-
if "cp313" in os.environ["CIBW_BUILD"]:
300+
if "cp313" in os.environ["CIBW_BUILD"] or "cp314" in os.environ["CIBW_BUILD"]:
301301
old = '${Python3_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var(\'LDSHARED\').lstrip().split(\' \', 1)[1])"'
302302
new = '${Python3_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var(\'LDSHARED\').lstrip().split(\' \', 1)[1].replace(\'-arch x86_64\', \'\'))"'
303303
replace_all("CMakeLists.txt", old, new)
@@ -438,6 +438,7 @@ def to_win_path(pt: Path):
438438
with open(stubs_error_file, "r") as fin:
439439
print(fin.read(), file=sys.stderr)
440440

441+
# Change directory here
441442
os.chdir(str(cwd))
442443

443444
# Copy RDKit and additional files to the wheel path

0 commit comments

Comments
 (0)