Skip to content

Commit

Permalink
update chapel homebrew formula to match release (chapel-lang#26082)
Browse files Browse the repository at this point in the history
This updates our homebrew formulas to match the version homebrew has
most recently released. It updates the python version in use from 3.12
to 3.13.

note that the patch in the release has since been merged on main so
that's why it's not also in `homebrew-main.rb`

trivial change to copies of homebrew formulas for testing only - not
reviewed.
  • Loading branch information
arezaii authored Oct 14, 2024
2 parents aa64396 + cd14bb0 commit 9169ffb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 12 deletions.
6 changes: 3 additions & 3 deletions util/packaging/homebrew/chapel-main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Chapel < Formula
depends_on "jemalloc"
depends_on "llvm@18"
depends_on "pkg-config"
depends_on "python@3.12"
depends_on "python@3.13"

# LLVM is built with gcc11 and we will fail on linux with gcc version 5.xx
fails_with gcc: "5"
Expand All @@ -28,8 +28,8 @@ def llvm

def install
# Always detect Python used as dependency rather than needing aliased Python formula
python = "python3.12"
# It should be noted that this will expand to: 'for cmd in python3.12 python3 python python2; do'
python = "python3.13"
# It should be noted that this will expand to: 'for cmd in python3.13 python3 python python2; do'
# in our find-python.sh script.
inreplace "util/config/find-python.sh", /^(for cmd in )(python3 )/, "\\1#{python} \\2"
inreplace "third-party/chpl-venv/Makefile", "python3 -c ", "#{python} -c "
Expand Down
34 changes: 25 additions & 9 deletions util/packaging/homebrew/chapel-release.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ class Chapel < Formula
head "https://github.com/chapel-lang/chapel.git", branch: "main"

bottle do
sha256 arm64_sequoia: "14a251ee7322a074dad39a8cc7dd0db9bf68458526ba5905c36508c4d9ee28f5"
sha256 arm64_sonoma: "929ce6c154e9d54d9c795b8f869f1247cbdc0d9b5a9a30e7614842dfd7a660f0"
sha256 arm64_ventura: "478587cf8190effca0543bacfac22d66a9672194e73fe184408795792a209a25"
sha256 sonoma: "ce4da24faa3e5723998c9dc33dfe23c32f3a31e7d47f75f30a189567b4532a90"
sha256 ventura: "30295a6d3dc7218295f247445a4a9cbc3f2d58b32d07e32faf5684108676bf35"
sha256 x86_64_linux: "2cfa7cbf0c3fbb43c3bc78f9b7b99e90a2a2b52aec2186256cfef0e70a804377"
rebuild 1
sha256 arm64_sequoia: "86a564896112278e0aee551ad00254242ff7eb374da45f945352beb6df974999"
sha256 arm64_sonoma: "82a836c46c1742bda66bfe00cc382597007b29dd9a1261eab74316095f0b0790"
sha256 arm64_ventura: "617283fed12c23b9d61023f77c1b82536b9064913761dd3b266d7055242b2e1a"
sha256 sonoma: "9e41f26c78876875e0d6cde3ebd54740b10d0054eb2929915ce1390fcc91ab3d"
sha256 ventura: "eb0a0093cd3c9ba5a2347f07c59bae86071ca5baaa8861f094db65ca5df6c2fd"
sha256 x86_64_linux: "252515f46ddc6ef16ef46edc26a4a6ad4cc352c6513a138a6a607ae5c7280f39"
end

depends_on "cmake"
Expand All @@ -23,7 +24,7 @@ class Chapel < Formula
depends_on "jemalloc"
depends_on "llvm@18"
depends_on "pkg-config"
depends_on "python@3.12"
depends_on "python@3.13"

# LLVM is built with gcc11 and we will fail on linux with gcc version 5.xx
fails_with gcc: "5"
Expand All @@ -32,10 +33,13 @@ def llvm
deps.map(&:to_formula).find { |f| f.name.match? "^llvm" }
end

# update pyyaml to support py3.13 build, upstream pr ref, https://github.com/chapel-lang/chapel/pull/26079
patch :DATA

def install
# Always detect Python used as dependency rather than needing aliased Python formula
python = "python3.12"
# It should be noted that this will expand to: 'for cmd in python3.12 python3 python python2; do'
python = "python3.13"
# It should be noted that this will expand to: 'for cmd in python3.13 python3 python python2; do'
# in our find-python.sh script.
inreplace "util/config/find-python.sh", /^(for cmd in )(python3 )/, "\\1#{python} \\2"
inreplace "third-party/chpl-venv/Makefile", "python3 -c ", "#{python} -c "
Expand Down Expand Up @@ -128,3 +132,15 @@ def install
system bin/"chplcheck", libexec/"examples/hello.chpl"
end
end

__END__
diff --git a/third-party/chpl-venv/test-requirements.txt b/third-party/chpl-venv/test-requirements.txt
index a8f97300..2da4f7de 100644
--- a/third-party/chpl-venv/test-requirements.txt
+++ b/third-party/chpl-venv/test-requirements.txt
@@ -1,4 +1,4 @@
-PyYAML==6.0.1
+PyYAML==6.0.2
filelock==3.12.2
argcomplete==3.1.2
setuptools==68.0.0

0 comments on commit 9169ffb

Please sign in to comment.