From 1785fdc7ec433e72cbb5fcba8b27443f8440d72a Mon Sep 17 00:00:00 2001 From: Richard Shadrach <45562402+rhshadrach@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:48:23 -0500 Subject: [PATCH] DEP: Loosely pin Cython to 3.0 (#56993) --- asv_bench/asv.conf.json | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 9b0dc14fe6747..e02ff26ba14e9 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -41,7 +41,7 @@ // pip (with all the conda available packages installed first, // followed by the pip installed packages). "matrix": { - "Cython": ["3.0.5"], + "Cython": ["3.0"], "matplotlib": [], "sqlalchemy": [], "scipy": [], diff --git a/environment.yml b/environment.yml index 58eb69ad1f070..5a2dd0b697084 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: # build dependencies - versioneer[toml] - - cython=3.0.5 + - cython~=3.0.5 - meson[ninja]=1.2.1 - meson-python=0.13.1 diff --git a/pyproject.toml b/pyproject.toml index ffd3a7e1f1f33..96e8ea90afa59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "meson-python==0.13.1", "meson==1.2.1", "wheel", - "Cython==3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json + "Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json # Any NumPy version should be fine for compiling. Users are unlikely # to get a NumPy<1.25 so the result will be compatible with all relevant # NumPy versions (if not it is presumably compatible with their version). diff --git a/requirements-dev.txt b/requirements-dev.txt index 5a63e59e1db88..13691d114ece4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ pip versioneer[toml] -cython==3.0.5 +cython~==3.0.5 meson[ninja]==1.2.1 meson-python==0.13.1 pytest>=7.3.2 diff --git a/setup.py b/setup.py index c7c76d0f7636a..737ebd270d1e4 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def is_platform_mac(): # note: sync with pyproject.toml, environment.yml and asv.conf.json -min_cython_ver = "3.0.5" +min_cython_ver = "3.0" try: from Cython import (