From 824e0d77ace0b9ea544d1194a2545e9ae18636a7 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@panodata.org>
Date: Wed, 22 Nov 2023 23:00:52 +0100
Subject: [PATCH] Dependencies: Remove "ngr", add "notebook", link "test" to
 "testing"

---
 .github/workflows/ngr.yml |  2 +-
 pyproject.toml            | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ngr.yml b/.github/workflows/ngr.yml
index 492cb3a..986a8e6 100644
--- a/.github/workflows/ngr.yml
+++ b/.github/workflows/ngr.yml
@@ -87,7 +87,7 @@ jobs:
         pip install --upgrade 'setuptools>=64'
 
         # Install package in editable mode.
-        pip install --use-pep517 --prefer-binary --editable='.[cli,ngr,develop,test]'
+        pip install --use-pep517 --prefer-binary --editable='.[cli,develop,test]'
 
     - name: Run linter and software tests
       run: |
diff --git a/pyproject.toml b/pyproject.toml
index 5fbe2be..540f814 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,7 +69,7 @@ dependencies = [
 
 [project.optional-dependencies]
 all = [
-  "pueblo[cli,ngr,nlp,testing,web]",
+  "pueblo[cli,nlp,notebook,testing,web]",
 ]
 cli = [
   "click<9",
@@ -79,37 +79,36 @@ cli = [
 ]
 develop = [
   "black[jupyter]<24",
-  "mypy==1.7.0",
+  "mypy==1.7",
   "poethepoet<1",
-  "pyproject-fmt>=1.3,<1.6",
+  "pyproject-fmt<1.6,>=1.3",
   "ruff==0.1.6",
   "validate-pyproject<0.16",
 ]
-ngr = [
-]
 nlp = [
   "aiohttp<3.10",
   "langchain",
   "unstructured<0.11",
 ]
+notebook = [
+  "nbclient<0.10",
+  "nbdime<4",
+  "notebook<8",
+  "pytest-notebook<0.10",
+]
 release = [
   "build<2",
   "twine<5",
 ]
 test = [
-  "nbclient<0.10",
-  "nbdime<4",
-  "pytest<8",
-  "pytest-cov<5",
-  "pytest-mock<4",
+  "pueblo[testing]",
 ]
 testing = [
   "coverage~=7.3",
-  "ipykernel",
   "pytest<8",
   "pytest-cov<5",
   "pytest-env<2",
-  "pytest-notebook<0.10",
+  "pytest-mock<4",
 ]
 web = [
   "requests-cache<2",