Merge 2b94694 into 9e2ad38

datalab-org · Oct 7, 2024 · d722659 · d722659
2 parents 9e2ad38 + 2b94694
commit d722659
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/pydatalab/pyproject.toml b/pydatalab/pyproject.toml
@@ -18,8 +18,12 @@ classifiers = [
 requires-python = ">= 3.10, < 3.12"
 
 dependencies = [
-    # Slightly confusing, but git dependencies cannot be included as extra by uv at the moment
-    "navani @ git+https://github.com/the-grey-group/navani.git@v0.1.5",
+    "bokeh ~= 2.4, < 3.0",
+    "matplotlib ~= 3.8",
+    "periodictable ~= 1.7",
+    "pydantic[email, dotenv] < 2.0",
+    "pint ~= 0.24",
+    "pandas[excel] ~= 2.2",
 ]
 
 [project.urls]
@@ -55,9 +59,7 @@ dev = [
 ]
 
 server = [
-    "pydantic[email, dotenv] < 2.0",
     "pymongo ~= 4.7",
-    "bokeh ~= 2.4, < 3.0",
     "Flask ~= 3.0",
     "Flask-Login ~= 0.6",
     "Flask-Cors ~= 5.0",
@@ -66,11 +68,7 @@ server = [
     "Flask-Mail ~= 0.10",
     "Flask-Compress ~= 1.15",
     "Werkzeug ~= 3.0",
-    "pandas[excel] ~= 2.2",
-    "matplotlib ~= 3.8",
     "python-dotenv ~= 1.0",
-    "pint ~= 0.24",
-    "periodictable ~= 1.7",
     "pillow ~= 10.4",
     "pyjwt ~= 2.9",
     "invoke ~= 2.2",
@@ -83,6 +81,7 @@ apps = [
     # NMR
     "nmrglue ~= 0.10",
     # Electrochemistry
+    "navani @ git+https://github.com/the-grey-group/navani.git@v0.1.7",
     "galvani ~= 0.4, < 0.5",
     "NewareNDA >= 2024",
     # Raman

diff --git a/pydatalab/requirements/requirements-all-dev.txt b/pydatalab/requirements/requirements-all-dev.txt
@@ -260,7 +260,7 @@ multidict==6.1.0
     #   yarl
 natsort==8.4.0
     # via mkdocs-awesome-pages-plugin
-navani @ git+https://github.com/the-grey-group/navani.git@32aa742c3b84aa63fb4e3bd7b1824acb89e2b61d
+navani @ git+https://github.com/the-grey-group/navani.git@d171781b483f0a17a0ada7a043c8f1e243499245
     # via datalab-server (pyproject.toml)
 newarenda==2024.10.1
     # via

diff --git a/pydatalab/requirements/requirements-all.txt b/pydatalab/requirements/requirements-all.txt
@@ -191,7 +191,7 @@ multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
-navani @ git+https://github.com/the-grey-group/navani.git@32aa742c3b84aa63fb4e3bd7b1824acb89e2b61d
+navani @ git+https://github.com/the-grey-group/navani.git@d171781b483f0a17a0ada7a043c8f1e243499245
     # via datalab-server (pyproject.toml)
 newarenda==2024.10.1
     # via

diff --git a/pydatalab/uv.lock b/pydatalab/uv.lock