Skip to content

Commit c700bdc

Browse files
github-actions[bot]Create or Update Pull Request Actionkuelumbus
authored
🤖 Bump RDKit version to Release_2024_09_2 (#117) [skip ci]
* Set RDKit version to Release_2024_09_2 * 🤖 Bump RDKit version to Release_2024_03_6 (#113) * Set RDKit version to Release_2024_03_6 * Fix boost detection issue with case-sensetive * Add python3 directory hint to cmake * Improve python root path finding. * Typo * Improve Python version detection for win * Add system lib install path of python * typo * Improve finding python 3 on win * Improve python finding for windows * Bump cmake and setupt tools * Add missing comma * improve lib finding * oops * deactivate tmate action * bump cibuildweehl * print config vars * Fix library path for python on win * Try * enable debug mode * give more search pa * Fix path * path * Get windows paths * oops * Fix * fix * try * test * test * Enable debug * t * Fix * test * Verbose output for compilation * verbose * Try 10 * enable find debug * fix * Fix * Clean up an try ninja for windows * Remove ninja on windows --------- Co-authored-by: Create or Update Pull Request Action <[email protected]> Co-authored-by: Christopher Kuenneth <[email protected]> * 🤖 Bump RDKit version to Release_2024_09_1 (#116) * Set RDKit version to Release_2024_09_1 * 🤖 Bump RDKit version to Release_2024_03_6 (#113) * Set RDKit version to Release_2024_03_6 * Fix boost detection issue with case-sensetive * Add python3 directory hint to cmake * Improve python root path finding. * Typo * Improve Python version detection for win * Add system lib install path of python * typo * Improve finding python 3 on win * Improve python finding for windows * Bump cmake and setupt tools * Add missing comma * improve lib finding * oops * deactivate tmate action * bump cibuildweehl * print config vars * Fix library path for python on win * Try * enable debug mode * give more search pa * Fix path * path * Get windows paths * oops * Fix * fix * try * test * test * Enable debug * t * Fix * test * Verbose output for compilation * verbose * Try 10 * enable find debug * fix * Fix * Clean up an try ninja for windows * Remove ninja on windows --------- Co-authored-by: Create or Update Pull Request Action <[email protected]> Co-authored-by: Christopher Kuenneth <[email protected]> * Enable Python 3.13 builds in GH actions and circle cci * fix finding python3.11.lib * Fix python 3.13 builds * enable debug for macos * Remove CIBW_ARCHS keyword * Update GithubAction python version. * Update cmake * Specify arm64 for cmake builds * Fix --------- Co-authored-by: Create or Update Pull Request Action <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christopher Kuenneth <[email protected]> Co-authored-by: Chris Kuenneth <[email protected]> * macOS armv8 for py 3.13 is not available for now * Bump conan to 1.66.0 * set macos runners on GH to macos-13 * cibuildwheel to 2.22.0 * Reset LDFLAGS for MacOS Arm64 py 3.13 * try 2 * Remove x86_64 from LDSHARED * fix quotations * remove -arch x86_64 as additional linking flag * MacOS arm64 for Py 3.13 now available [skip ci] --------- Co-authored-by: Create or Update Pull Request Action <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christopher Kuenneth <[email protected]> Co-authored-by: Chris Kuenneth <[email protected]>
1 parent e60b262 commit c700bdc

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
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.21.3
21+
python3 -m pip install cibuildwheel==2.22.0
2222
python3 -m cibuildwheel --output-dir wheelhouse
2323
- store_artifacts:
2424
path: wheelhouse/

‎.github/workflows/wheels.yml‎

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

9696
# MacOS 64 bit Intel: x86_64
97-
- os: macos-12
97+
- os: macos-13
9898
bitness: 64
9999
python: 39
100100
platform_id: macosx_x86_64
101-
- os: macos-12
101+
- os: macos-13
102102
bitness: 64
103103
python: 310
104104
platform_id: macosx_x86_64
105-
- os: macos-12
105+
- os: macos-13
106106
bitness: 64
107107
python: 311
108108
platform_id: macosx_x86_64
109-
- os: macos-12
109+
- os: macos-13
110110
bitness: 64
111111
python: 312
112112
platform_id: macosx_x86_64
113-
- os: macos-12
113+
- os: macos-13
114114
bitness: 64
115115
python: 313
116116
platform_id: macosx_x86_64
@@ -158,7 +158,7 @@ jobs:
158158
cd C:\\rdkit
159159
echo "C:\\libs" >> $GITHUB_PATH
160160
fi
161-
python -m pip install cibuildwheel==2.21.3
161+
python -m pip install cibuildwheel==2.22.0
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
@@ -23,7 +23,7 @@ Please open an issue if you find something missing or not working as expected.
2323
| Linux | intel | 64 | glibc >= 2.28 (e.g., Ubuntu 18.04+, CentOS 6+, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2424
| Linux | aarch64 | 64 | glibc >= 2.28 (e.g., Raspberry Pi, ...) | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Circle CI |
2525
| macOS | intel | 64 | >= macOS 10.13 | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
26-
| macOS | armv8 | 64 | >= macOS 11, M1 hardware | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | | Github Actions |
26+
| macOS | armv8 | 64 | >= macOS 11, M1 hardware | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2727
| Windows | intel | 64 | | last: 2024.3.5 | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | Github Actions |
2828

2929
## Installation

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ requires = [
44
"wheel",
55
"cmake == 3.31.1",
66
"numpy",
7-
"conan == 1.64.0",
7+
"conan == 1.66.0",
88
"ninja",
99
"pybind11-stubgen",
1010
"Pillow", # required for building the stubs

‎setup.py‎

Lines changed: 18 additions & 16 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_1"
15+
rdkit_tag = "Release_2024_09_2"
1616

1717
with open("README.md", "r", encoding="utf-8") as fh:
1818
long_description = fh.read()
@@ -196,21 +196,8 @@ def replace_all(file, search_exp, replace_exp):
196196
'find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)',
197197
'find_package(Python3 COMPONENTS Interpreter Development NumPy)',
198198
)
199-
200-
201199

202-
print("---- Conf vars", file=sys.stderr)
203-
print(sysconfig.get_paths(), file=sys.stderr)
204-
print(sysconfig.get_config_vars(), file=sys.stderr)
205-
print("---- Conf vars", file=sys.stderr)
206-
207-
208-
209-
print("---- Conf vars", file=sys.stderr)
210-
print(sysconfig.get_paths(), file=sys.stderr)
211-
print(sysconfig.get_config_vars(), file=sys.stderr)
212-
print("---- Conf vars", file=sys.stderr)
213-
200+
214201

215202
# Define CMake options
216203
options = [
@@ -294,6 +281,14 @@ def to_win_path(pt: Path):
294281
f"-DCMAKE_OSX_ARCHITECTURES=arm64",
295282
f"-DCMAKE_VERBOSE_MAKEFILE=ON" # Increase verbosity
296283
]
284+
# for python 3.13 macOS ARM64, 'CFLAGS', 'LDFLAGS', 'LDSHARED', 'BLDSHARED' contains '-arch x86_64'
285+
# see https://github.com/rdkit/rdkit/blob/498f57a4eb99a67d842cbc3f89f94b302f398a11/CMakeLists.txt#L376C59-L376C95
286+
# remove "-arch x86_64" from PYTHON_LDSHARED
287+
if "cp313" in os.environ["CIBW_BUILD"]:
288+
old = '${Python3_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var(\'LDSHARED\').lstrip().split(\' \', 1)[1])"'
289+
new = '${Python3_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var(\'LDSHARED\').lstrip().split(\' \', 1)[1].replace(\'-arch x86_64\', \'\'))"'
290+
replace_all("CMakeLists.txt", old, new)
291+
297292

298293
if "linux" in sys.platform:
299294
# Use ninja for linux builds
@@ -310,7 +305,7 @@ def to_win_path(pt: Path):
310305
]
311306
else:
312307
cmds = [
313-
f"cmake -S . -B build --debug-find-pkg=Python3 {' '.join(options)} ",
308+
f"cmake -S . -B build -LAH --debug-find-pkg=Python3 {' '.join(options)} ",
314309
"cmake --build build --config Release",
315310
"cmake --install build",
316311
]
@@ -321,6 +316,13 @@ def to_win_path(pt: Path):
321316
path_site_packages = rdkit_install_path / "lib" / py_name / "site-packages"
322317
if sys.platform == "win32":
323318
path_site_packages = rdkit_install_path / "Lib" / "site-packages"
319+
320+
321+
print("---- Conf vars", file=sys.stderr)
322+
print(sysconfig.get_paths(), file=sys.stderr)
323+
print(sysconfig.get_config_vars(), file=sys.stderr)
324+
print("---- Conf vars", file=sys.stderr)
325+
324326

325327
print("!!! --- CMAKE build command and variables for RDKit", file=sys.stderr)
326328
print(cmds, file=sys.stderr)

0 commit comments

Comments
 (0)