From e9096b3003bdf2811a97907929cf411bbf0996b0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 18 Sep 2023 11:52:41 -0700 Subject: [PATCH 1/2] Add pyproject.toml, remove Cython from setup_requires, install_requires --- pyproject.toml | 2 ++ setup.py | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..e3cff08f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ['setuptools', 'Cython>=0.28'] diff --git a/setup.py b/setup.py index 37acdfce..83b1463d 100755 --- a/setup.py +++ b/setup.py @@ -201,9 +201,6 @@ def run(self): long_description=README, long_description_content_type='text/x-rst', classifiers=classifiers, - install_requires=["Cython>=0.28"], - setup_requires=["Cython>=0.28"], - ext_modules=extensions, packages=["cysignals"], package_dir={"": "src"}, From 63d401f8a1ca43bca5d77030524b069f7c1783c4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 18 Sep 2023 12:37:41 -0700 Subject: [PATCH 2/2] pyproject.toml, .github/workflows/ci-sage.yml: For now, use Cython < 3 --- .github/workflows/ci-sage.yml | 6 +++--- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 71070dbc..bf55c2ff 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -111,7 +111,7 @@ jobs: choco install make autoconf gcc-core gcc-g++ python3${{ matrix.python-version }}-devel --source cygwin - name: install dependencies run: | - C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && python3.${{ matrix.python-version }} -m pip install setuptools cysignals Cython Sphinx flake8' + C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && python3.${{ matrix.python-version }} -m pip install setuptools cysignals 'Cython<3' Sphinx flake8' - name: install run: | C:\\tools\\cygwin\\bin\\bash -l -x -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && python3.${{ matrix.python-version }} setup.py build_ext -i' @@ -241,7 +241,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools Cython Sphinx flake8 + pip install setuptools 'Cython<3' Sphinx flake8 - name: Freeze pip run: | pip freeze @@ -354,7 +354,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools Cython Sphinx flake8 + pip install setuptools 'Cython<3' Sphinx flake8 - name: Freeze pip run: | pip freeze diff --git a/pyproject.toml b/pyproject.toml index e3cff08f..341910bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,2 @@ [build-system] -requires = ['setuptools', 'Cython>=0.28'] +requires = ['setuptools', 'Cython>=0.28, <3']