Skip to content

Bug fix for py-jupyter-server and hidden npm/node dependency #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 4 commits into from
Mar 20, 2024
Merged

Bug fix for py-jupyter-server and hidden npm/node dependency #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca02e13
Add variant typescript for py-jupyter-server@:1, which then requires …
climbfuji Mar 19, 2024
92292b7
Fix formatting in var/spack/repos/builtin/packages/py-jupyter-server/…
climbfuji Mar 19, 2024
dde2684
Constrain typescript variant to py-jupyter-server versions 1.10.2:1
climbfuji Mar 20, 2024
a8569fd
with when not needed if variant doesn't exist for other versions
climbfuji Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions var/spack/repos/builtin/packages/py-jupyter-server/no_npm_node.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/pyproject.toml 2024-03-19 15:58:20.000000000 -0600
+++ b/pyproject.toml 2024-03-19 15:59:15.000000000 -0600
@@ -5,6 +5,11 @@
[tool.jupyter-packaging.builder]
factory = "jupyter_packaging.npm_builder"

+# Injected by spack to solve problems with hidden npm/node dependencies
+# https://github.com/spack/spack/issues/41899
+[tool.jupyter-packaging.build-args]
+npm = "/dev/null"
+
[tool.check-manifest]
ignore = ["tbump.toml", ".*", "*.yml", "package-lock.json", "bootstrap*", "conftest.py"]

6 changes: 6 additions & 0 deletions var/spack/repos/builtin/packages/py-jupyter-server/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class PyJupyterServer(PythonPackage):
version("1.9.0", sha256="7d19006380f6217458a9db309b54e3dab87ced6c06329c61823907bef2a6f51b")
version("1.6.1", sha256="242ddd0b644f10e030f917019b47c381e0f2d2b950164af45cbd791d572198ac")

variant("typescript", default=False, description="Build the typescript code", when="@1.10.2:1")

# https://github.com/spack/spack/issues/41899
patch("no_npm_node.patch", when="@1.10.2:1 ~typescript")

depends_on("python@3.8:", when="@2:", type=("build", "run"))
depends_on("py-hatchling@1.11:", when="@2:", type="build")
# under [tool.hatch.build.hooks.jupyter-builder] in pyproject.toml
Expand All @@ -38,6 +43,7 @@ class PyJupyterServer(PythonPackage):
depends_on("py-pre-commit", when="@1.16:", type="build")
depends_on("py-setuptools", type="build")

depends_on("npm", type="build", when="+typescript")
depends_on("py-anyio@3.1.0:", when="@2.2.1:", type=("build", "run"))
depends_on("py-anyio@3.1.0:3", when="@:2.2.0", type=("build", "run"))
depends_on("py-argon2-cffi", type=("build", "run"))
Expand Down