From d3e8c6fdd94c59d4c87c40cebda023724e6a8810 Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Tue, 22 Aug 2023 11:39:25 +0200 Subject: [PATCH] Use a pinned version of Cython for now, as most of the recipes are incompatible with Cython==3.x.x (#844) --- .github/workflows/kivy_ios.yml | 6 +++--- .github/workflows/setup.yml | 2 +- kivy_ios/recipes/numpy/__init__.py | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/kivy_ios.yml b/.github/workflows/kivy_ios.yml index 7814c5c7..ce74f038 100644 --- a/.github/workflows/kivy_ios.yml +++ b/.github/workflows/kivy_ios.yml @@ -38,7 +38,7 @@ jobs: pip3 install -r requirements.txt brew install autoconf automake libtool pkg-config brew link libtool - pip3 install Cython==0.29.33 + pip3 install Cython==0.29.36 sudo gem install xcpretty - name: Install kivy-ios run: | @@ -77,7 +77,7 @@ jobs: pip install sh brew install autoconf automake libtool pkg-config brew link libtool - pip install Cython==0.29.33 + pip install Cython==0.29.36 sudo gem install xcpretty - name: Install kivy-ios run: | @@ -116,7 +116,7 @@ jobs: pip3 install -r requirements.txt brew install autoconf automake libtool pkg-config brew link libtool - pip3 install Cython==0.29.33 + pip3 install Cython==0.29.36 - name: Install kivy-ios run: | python setup.py install diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index d1b689cc..4684aded 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -26,7 +26,7 @@ jobs: python -m venv venv . venv/bin/activate pip install dist/kivy-ios-*.tar.gz - pip install Cython==0.29.33 + pip install Cython==0.29.36 brew install autoconf automake libtool pkg-config - name: Basic toolchain commands run: | diff --git a/kivy_ios/recipes/numpy/__init__.py b/kivy_ios/recipes/numpy/__init__.py index 1b47afe5..203be282 100644 --- a/kivy_ios/recipes/numpy/__init__.py +++ b/kivy_ios/recipes/numpy/__init__.py @@ -11,7 +11,7 @@ class NumpyRecipe(CythonRecipe): libraries = ["libnpymath.a", "libnpyrandom.a"] include_dir = "numpy/core/include" depends = ["python"] - hostpython_prerequisites = ["Cython"] + hostpython_prerequisites = ["Cython==0.29.36"] cythonize = False def prebuild_arch(self, arch): diff --git a/requirements.txt b/requirements.txt index 30474ca8..567cd7c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ Pillow>=6.1.0 requests>=2.13 cookiecutter==2.1.1 sh==1.12.14 -Cython==0.29.17 \ No newline at end of file +Cython==0.29.36 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 11642599..881a2eab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,7 @@ url = https://github.com/kivy/kivy-ios [options] python_requires >= "3.6.0" install_requires = - Cython + Cython==0.29.36 cookiecutter pbxproj Pillow