Skip to content

Commit a372c6a

Browse files
jiridanekclaude
andauthored
RHAIENG-2509: extract DB connectors, JupyterLab, and JupyterLab datascience deps into subprojects (#2796)
Add 3 new dependency subprojects to reduce duplication across pyproject.toml files: - odh-notebooks-meta-db-connectors-deps (pymongo, psycopg, pyodbc, mysql-connector-python) - odh-notebooks-meta-jupyterlab-deps (jupyterlab, jupyter-server, extensions) - odh-notebooks-meta-jupyterlab-datascience-deps (odh-elyra, jupyter-bokeh, jupyterlab-lsp, etc.) Existing subprojects are unchanged. Updated 14 pyproject.toml files and regenerated lock files. Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 0ff26fa commit a372c6a

File tree

40 files changed

+179
-218
lines changed

40 files changed

+179
-218
lines changed

codeserver/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[project]
2+
name = "odh-notebooks-meta-db-connectors-deps"
3+
version = "0.1.0"
4+
requires-python = "==3.12.*"
5+
6+
dependencies = [
7+
"pymongo",
8+
"psycopg",
9+
"pyodbc",
10+
"mysql-connector-python",
11+
]
12+
13+
[tool.uv]
14+
package = false
15+
16+
environments = [
17+
"sys_platform == 'linux' and implementation_name == 'cpython'",
18+
]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[project]
2+
name = "odh-notebooks-meta-jupyterlab-datascience-deps"
3+
version = "0.1.0"
4+
requires-python = "==3.12.*"
5+
6+
dependencies = [
7+
"odh-elyra",
8+
"jupyter-bokeh",
9+
"jupyterlab-lsp",
10+
"jupyterlab-widgets",
11+
"jupyter-resource-usage",
12+
]
13+
14+
[tool.uv]
15+
package = false
16+
17+
environments = [
18+
"sys_platform == 'linux' and implementation_name == 'cpython'",
19+
]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[project]
2+
name = "odh-notebooks-meta-jupyterlab-deps"
3+
version = "0.1.0"
4+
requires-python = "==3.12.*"
5+
6+
dependencies = [
7+
"jupyterlab",
8+
"jupyter-server",
9+
"jupyter-server-proxy",
10+
"jupyter-server-terminals",
11+
"jupyterlab-git",
12+
"nbdime",
13+
"nbgitpuller",
14+
"odh-jupyter-trash-cleanup",
15+
]
16+
17+
[tool.uv]
18+
package = false
19+
20+
environments = [
21+
"sys_platform == 'linux' and implementation_name == 'cpython'",
22+
]

jupyter/datascience/ubi9-python-3.12/pyproject.toml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,9 @@ dependencies = [
99
"feast~=0.61.0",
1010
"skl2onnx~=1.20.0",
1111
"odh-notebooks-meta-workbench-datascience-deps",
12-
13-
# DB connectors
14-
"pymongo~=4.16.0",
15-
"psycopg~=3.3.2",
16-
"pyodbc~=5.3.0",
17-
"mysql-connector-python~=9.6.0",
18-
19-
# JupyterLab packages
20-
"odh-elyra==5.0.0",
21-
"odh-jupyter-trash-cleanup==0.1.1",
22-
23-
"jupyterlab~=4.5.2",
24-
"jupyter-bokeh~=4.0.5",
25-
"jupyter-server~=2.17.0",
26-
"jupyter-server-proxy~=4.4.0",
27-
"jupyter-server-terminals~=0.5.3",
28-
"jupyterlab-git~=0.51.2",
29-
"jupyterlab-lsp~=5.1.1",
30-
"jupyterlab-widgets~=3.0.15",
31-
"jupyter-resource-usage~=1.1.1",
32-
"nbdime~=4.0.2",
33-
"nbgitpuller~=1.2.2",
12+
"odh-notebooks-meta-db-connectors-deps",
13+
"odh-notebooks-meta-jupyterlab-deps",
14+
"odh-notebooks-meta-jupyterlab-datascience-deps",
3415

3516
# Base packages
3617
"wheel~=0.46.3",
@@ -53,3 +34,6 @@ override-dependencies = [
5334
]
5435
[tool.uv.sources]
5536
odh-notebooks-meta-workbench-datascience-deps = { path = "../../../dependencies/odh-notebooks-meta-workbench-datascience-deps" }
37+
odh-notebooks-meta-db-connectors-deps = { path = "../../../dependencies/odh-notebooks-meta-db-connectors-deps" }
38+
odh-notebooks-meta-jupyterlab-deps = { path = "../../../dependencies/odh-notebooks-meta-jupyterlab-deps" }
39+
odh-notebooks-meta-jupyterlab-datascience-deps = { path = "../../../dependencies/odh-notebooks-meta-jupyterlab-datascience-deps" }

jupyter/datascience/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jupyter/minimal/ubi9-python-3.12/pyproject.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@ dependencies = [
77
"uv",
88
"micropipenv[toml]",
99

10-
# JupyterLab packages
11-
"odh-jupyter-trash-cleanup",
12-
13-
"jupyterlab",
14-
"jupyter-server",
15-
"jupyter-server-proxy",
16-
"jupyter-server-terminals",
17-
"jupyterlab-git",
18-
"nbdime",
19-
"nbgitpuller",
10+
"odh-notebooks-meta-jupyterlab-deps",
2011

2112
# Base packages
2213
"wheel",
2314
"setuptools",
2415
]
2516

17+
[tool.uv.sources]
18+
odh-notebooks-meta-jupyterlab-deps = { path = "../../../dependencies/odh-notebooks-meta-jupyterlab-deps" }
19+
2620
[tool.uv]
2721
environments = [
2822
"sys_platform == 'linux' and implementation_name == 'cpython'",

jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.rocm.toml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)