From b1b5bffef4c045b3ce1d1fd8ff7db80c4af74a5d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 21 Jun 2023 13:10:36 -0400 Subject: [PATCH] chore: change dev extra to add extra requirements Signed-off-by: Henry Schreiner --- .github/workflows/ci.yml | 10 +--------- pyproject.toml | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edc7567da..35c2625af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,15 +83,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install package - run: >- - pip install -e.[test,cov] cmake ninja rich hatch-fancy-pypi-readme - setuptools-scm - - - name: Add NumPy - if: >- - (matrix.runs-on == 'ubuntu-latest' || matrix.python-version != - 'pypy-3.8') && matrix.python-version != '3.12-dev' - run: "pip install --only-binary=:all: numpy" + run: pip install -e.[test,dev,cov] - name: Test package run: >- diff --git a/pyproject.toml b/pyproject.toml index 4236a4a11..e3ec0e29a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,11 +34,11 @@ dynamic = ["version"] dependencies = [ "exceptiongroup; python_version<'3.11'", - "importlib_resources >=1.3; python_version<'3.9'", - "importlib_metadata; python_version<'3.8'", + "importlib-resources >=1.3; python_version<'3.9'", + "importlib-metadata; python_version<'3.8'", "packaging >=20.9", "tomli >=1.1; python_version<'3.11'", - "typing_extensions >=3.10.0; python_version<'3.8'", + "typing-extensions >=3.10.0; python_version<'3.8'", ] # Note: for building wheels and sdists, there are also additional dependencies # in the pyproject extra. And cmake and possibly ninja if those are not already @@ -52,7 +52,7 @@ pyproject = [ test = [ "build[virtualenv]", "cattrs >=22.2.0", - "importlib_metadata; python_version<'3.8'", + "importlib-metadata; python_version<'3.8'", "pathspec >=0.10.1", "pybind11", "pyproject-metadata >=0.5", @@ -65,20 +65,24 @@ cov = [ "pytest-cov[toml]", ] dev = [ - "build", - "cattrs >=22.2.0", - "pytest >=7.0", - "pytest-subprocess", + "cmake", + "hatch-fancy-pypi-readme", + "ninja", + "numpy; python_version<'3.12' and platform_python_implementation!='PyPy'", + "numpy~=1.21.0; python_version=='3.7' and platform_python_implementation=='PyPy' and sys_platform == 'linux'", + "numpy~=1.24.0; python_version=='3.8' and platform_python_implementation=='PyPy'", + "numpy~=1.25.0; python_version=='3.9' and platform_python_implementation=='PyPy'", "rich", + "setuptools-scm", ] docs = [ "furo", - "myst_parser >=0.13", + "myst-parser >=0.13", "pathspec >=0.10.1", "pyproject-metadata >=0.5", "sphinx >=4.0", - "sphinx_copybutton", - "sphinx_inline_tabs", + "sphinx-copybutton", + "sphinx-inline-tabs", ] [project.urls]