From b62fc02fa657426ea16f8b795f1fd9682724fb06 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 10 Oct 2022 10:06:34 +0200 Subject: [PATCH 1/2] dev requirements: Update Cython and descartes Require newer version of Cython for Python 3.11, and specify minimum instead of specific versions for Cython and Descartes. --- requirements-dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 4f399aef5..a4fdd5a27 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -cython==0.29.21 -descartes==1.0.1 +cython>=0.29.32 +descartes>=1.0.1 matplotlib numpy>=1.4.1 pytest From 7c51361dfd493293727613b15cf51b3fcc7c85ca Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 10 Oct 2022 10:15:29 +0200 Subject: [PATCH 2/2] Move dev requirements to pyproject.toml Removes requirements-dev.txt and consolidates those requirements as optional dependencies in pyproject.toml with the [dev] extra. --- docs/installation.rst | 3 +-- pyproject.toml | 5 +++-- requirements-dev.txt | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 requirements-dev.txt diff --git a/docs/installation.rst b/docs/installation.rst index c4646750e..bbb234d69 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -79,8 +79,7 @@ using ``venv``: $ python3 -m venv . $ source bin/activate - (env) $ pip install -r requirements-dev.txt - (env) $ pip install -e . + (env) $ pip install -e .[dev] Or using ``conda``: diff --git a/pyproject.toml b/pyproject.toml index 17c63ce00..ce577f267 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ - "cython", + "cython>=0.29.32", "oldest-supported-numpy", - "setuptools>=61.0.0", + "setuptools>=63", ] build-backend = "setuptools.build_meta" @@ -42,6 +42,7 @@ dependencies = [ [project.optional-dependencies] test = ["pytest"] docs = ["sphinx", "numpydoc"] +dev = ["descartes>=1.0.1", "matplotlib", "pytest", "pytest-cov", "wheel"] [project.urls] Documentation = "https://shapely.readthedocs.io/" diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index a4fdd5a27..000000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,8 +0,0 @@ -cython>=0.29.32 -descartes>=1.0.1 -matplotlib -numpy>=1.4.1 -pytest -pytest-cov -setuptools -wheel