Skip to content

Commit 490b9a4

Browse files
authored
Merge pull request #196739 from Homebrew/nbdime-dsl
nbdime: use venv dsl
2 parents 3718796 + c1ce26a commit 490b9a4

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

Formula/n/nbdime.rb

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@ class Nbdime < Formula
88
license "BSD-3-Clause"
99

1010
bottle do
11-
sha256 cellar: :any_skip_relocation, arm64_sequoia: "3f364b59cb493998682aad19b1fa6442a4a72742cd54513bd7d6f18cb71a96df"
12-
sha256 cellar: :any_skip_relocation, arm64_sonoma: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
13-
sha256 cellar: :any_skip_relocation, arm64_ventura: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
14-
sha256 cellar: :any_skip_relocation, arm64_monterey: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
15-
sha256 cellar: :any_skip_relocation, sonoma: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
16-
sha256 cellar: :any_skip_relocation, ventura: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
17-
sha256 cellar: :any_skip_relocation, monterey: "e50a4de40896b059482ae1a425e2a079e9582a4ac9524c9b471bd0168b708971"
18-
sha256 cellar: :any_skip_relocation, x86_64_linux: "2e70c710b757fc4cc96409ba82fe03c9b23f1be2c9ed2efa515874c4d138a55e"
11+
rebuild 1
12+
sha256 cellar: :any_skip_relocation, all: "3781ad21688bc5c8fd2c350d156676a6286aad94326fcc6bbf23d2909781ee0d"
1913
end
2014

2115
depends_on "certifi"
@@ -62,24 +56,18 @@ class Nbdime < Formula
6256
sha256 "dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
6357
end
6458

65-
def python3
66-
"python3.12"
67-
end
68-
6959
def install
7060
# We already have jupyterlab, but don't use --no-build-isolation since
7161
# hatchling adds additional build deps
72-
inreplace "pyproject.toml",
73-
'requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5"]',
74-
'requires = ["hatchling>=1.5.0"]'
62+
inreplace "pyproject.toml", 'requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5"]',
63+
'requires = ["hatchling>=1.5.0"]'
7564

76-
virtualenv_install_with_resources
65+
venv = virtualenv_install_with_resources
7766

78-
site_packages = Language::Python.site_packages(python3)
79-
paths = %w[jupyterlab].map do |p|
80-
"import site; site.addsitedir('#{Formula[p].opt_libexec/site_packages}')"
81-
end
82-
(libexec/site_packages/"homebrew-deps.pth").write paths.join("\n")
67+
# Provide an exception to avoid dealing with `jupyterlab` dependency tree
68+
site_packages = Language::Python.site_packages(venv.root/"bin/python3")
69+
pth_contents = "import site; site.addsitedir('#{Formula["jupyterlab"].opt_libexec/site_packages}')\n"
70+
(venv.site_packages/"homebrew-jupyterlab.pth").write pth_contents
8371
end
8472

8573
test do

0 commit comments

Comments
 (0)