From 6538a3ab6c0fe50ab2392e376573936edf9756b4 Mon Sep 17 00:00:00 2001 From: izofat Date: Thu, 5 Sep 2024 11:58:33 +0300 Subject: [PATCH 1/3] Cleanup requests dependency and move to examples group --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10eadf7..58083e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ dependencies = [ 'pydantic >= 2.0.0', 'python-dotenv', 'pyyaml', - 'requests', 'ruptures', 'scipy', 'seaborn', @@ -47,7 +46,6 @@ dev = [ 'types-pyyaml', 'types-tabulate', 'types-toml', - 'types-requests', 'types-tqdm', 'ruff', 'mypy', @@ -57,6 +55,10 @@ jupyter = [ 'notebook', 'ipywidgets', ] +examples = [ + "requests", + "types-requests", +] [tool.setuptools.packages.find] where = ["."] From 9aa7395c6f5755825d1d6601c2dcda165cd5a6ae Mon Sep 17 00:00:00 2001 From: izofat Date: Thu, 5 Sep 2024 12:59:54 +0300 Subject: [PATCH 2/3] Jupyter group moved to examples and all group added --- README.md | 2 +- pyproject.toml | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 21d0f77..e89743c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ cd wind-up python -m venv .venv source .venv/Scripts/activate # or .venv/bin/activate on linux or ".venv/Scripts/activate" in Windows command prompt # install the package in editable mode with the dev dependencies -pip install -e .[dev] # or .[jupyter,dev] if you want jupyter dependencies as well +pip install -e .[dev] # or .[all] if you want examples dependencies as well or .[examples] if you want only examples dependencies ``` Use `poe all` to run all required pre-push commands (make sure the virtual environment is activated) diff --git a/pyproject.toml b/pyproject.toml index 58083e9..9001a6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project.optional-dependencies] -dev = [ +all = [ 'pytest', 'coverage', 'poethepoet', @@ -49,15 +49,29 @@ dev = [ 'types-tqdm', 'ruff', 'mypy', -] -jupyter = [ 'jupyterlab', 'notebook', 'ipywidgets', + 'requests', + 'types-requests', +] +dev = [ + 'pytest', + 'coverage', + 'poethepoet', + 'types-pyyaml', + 'types-tabulate', + 'types-toml', + 'types-tqdm', + 'ruff', + 'mypy', ] examples = [ - "requests", - "types-requests", + 'jupyterlab', + 'notebook', + 'ipywidgets', + 'requests', + 'types-requests', ] [tool.setuptools.packages.find] From 6a1b4ee8538037b33f643bafdc355e95159a32f8 Mon Sep 17 00:00:00 2001 From: Alex Clerc Date: Fri, 6 Sep 2024 08:42:33 +0100 Subject: [PATCH 3/3] Update pyproject.toml define all using other groups --- pyproject.toml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9001a6c..fa6b517 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,22 +39,6 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project.optional-dependencies] -all = [ - 'pytest', - 'coverage', - 'poethepoet', - 'types-pyyaml', - 'types-tabulate', - 'types-toml', - 'types-tqdm', - 'ruff', - 'mypy', - 'jupyterlab', - 'notebook', - 'ipywidgets', - 'requests', - 'types-requests', -] dev = [ 'pytest', 'coverage', @@ -73,6 +57,7 @@ examples = [ 'requests', 'types-requests', ] +all = ["res-wind-up[dev,examples]"] [tool.setuptools.packages.find] where = ["."]