From 109f94778ea3e44a9f92de6bdd4eb15384e488b3 Mon Sep 17 00:00:00 2001 From: Max Bachmann Date: Wed, 22 Jun 2022 16:23:35 +0200 Subject: [PATCH] exclude cmake on arm machines (#224) --- CHANGELOG.md | 6 +++++- docs/conf.py | 2 +- pyproject.toml | 4 ++-- rapidfuzz/__init__.py | 2 +- setup.py | 2 +- tools/sdist.patch | 6 +++--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eed4095..19e3bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ ## Changelog -### [2.0.12] - 2022-* +### [2.0.13] - 2022-06-22 +#### Changed +- use system version of cmake on arm platforms, since the cmake package fails to compile + +### [2.0.12] - 2022-06-22 #### Changed - add tests to sdist - remove cython dependency for sdist diff --git a/docs/conf.py b/docs/conf.py index c36c56a..80548e5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ copyright = '2021, Max Bachmann' author = 'Max Bachmann' # The full version, including alpha/beta/rc tags -release = '2.0.12' +release = '2.0.13' # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 3f46c01..77ff739 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,8 @@ requires = [ "setuptools>=42", "scikit-build>=0.13.0", - "cmake", - "ninja; platform_system!='Windows'", + "cmake; platform_machine not in 'armv7l|armv6l|arm64|aarch64'", + "ninja; platform_system!='Windows' and platform_machine not in 'armv7l|armv6l|arm64|aarch64'", "oldest-supported-numpy", "Cython==3.0.0a10", "rapidfuzz_capi==1.0.5" diff --git a/rapidfuzz/__init__.py b/rapidfuzz/__init__.py index 21ef7a1..9dbab10 100644 --- a/rapidfuzz/__init__.py +++ b/rapidfuzz/__init__.py @@ -3,7 +3,7 @@ rapid string matching library """ __author__ = "Max Bachmann" __license__ = "MIT" -__version__ = "2.0.12" +__version__ = "2.0.13" from rapidfuzz import ( process, diff --git a/setup.py b/setup.py index 2c3c46a..0f32b93 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.md', 'rt', encoding="utf8") as f: setup( name="rapidfuzz", - version="2.0.12", + version="2.0.13", install_requires=["jarowinkler >= 1.0.3, < 1.1.0"], extras_require={'full': ['numpy']}, url="https://github.com/maxbachmann/RapidFuzz", diff --git a/tools/sdist.patch b/tools/sdist.patch index fd8fc25..155b966 100644 --- a/tools/sdist.patch +++ b/tools/sdist.patch @@ -1,10 +1,10 @@ diff --git a/pyproject.toml b/pyproject.toml -index 3f46c01..f0c66b5 100644 +index 77ff739..1c08c4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,6 @@ requires = [ - "cmake", - "ninja; platform_system!='Windows'", + "cmake; platform_machine not in 'armv7l|armv6l|arm64|aarch64'", + "ninja; platform_system!='Windows' and platform_machine not in 'armv7l|armv6l|arm64|aarch64'", "oldest-supported-numpy", - "Cython==3.0.0a10", "rapidfuzz_capi==1.0.5"