Skip to content
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

Jump to bottom

hy: fix crash on python 3.12.6 #183996

Merged
merged 2 commits into from
Sep 9, 2024
Merged

hy: fix crash on python 3.12.6 #183996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
994d26f
hy: fix crash on python 3.12.6
branchvincent Sep 9, 2024
083d428
hy: update 0.29.0_1 bottle.
BrewTestBot Sep 9, 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
33 changes: 22 additions & 11 deletions Formula/h/hy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@ class Hy < Formula
url "https://files.pythonhosted.org/packages/88/53/e92bfd8a36dc4a62e0922d409f703299eac8a0a74ed4db2106acad4f00a0/hy-0.29.0.tar.gz"
sha256 "1f985c92fddfb09989dd2a2ad75bf661efcbad571352eb5ee48c8b8e08f666fa"
license "MIT"
revision 1

bottle do
sha256 cellar: :any_skip_relocation, arm64_sonoma: "bab260cac5449586ba47b527990cd1e4f3dc1f74461b18a4231ba7103c62547c"
sha256 cellar: :any_skip_relocation, arm64_ventura: "0621a28e341f9af1e3809a4276ecbab61cbd2c722b913b069fa3deadcdbb1881"
sha256 cellar: :any_skip_relocation, arm64_monterey: "41b1022eb4b374e9fbd341ffd0e976b7c232776203cfc1ceea7b2938879fb6c8"
sha256 cellar: :any_skip_relocation, sonoma: "0f4f12dfa2db324f4df20abb6cb1d301a45f1a22d2511b4ead5abf6d32214534"
sha256 cellar: :any_skip_relocation, ventura: "3f61cd38bc97e453c4fbec448c776ac1d5d29246afe73efc7e10d16e726a6200"
sha256 cellar: :any_skip_relocation, monterey: "164b718ad1443e523b08675f086b5a8a04e32e982a788a4fd1a555e0e767c9ef"
sha256 cellar: :any_skip_relocation, x86_64_linux: "bb45f61f54b6e4804a6483766f59f66aed26e755fc75ff21de7bebf239ac7ab5"
sha256 cellar: :any_skip_relocation, all: "f2c93fbd996b0bd4d2c4eaf52ec56a8559d657478bd6b79934d3e344b109477c"
end

depends_on "python@3.12"
Expand All @@ -24,17 +19,33 @@ class Hy < Formula
sha256 "a2c4a0d7942f7a0e7635c369d921066c8d4cae7f8b5bf7914466bec3c69837f4"
end

# Fix crash on python 3.12.6: https://github.com/hylang/hy/pull/2599
patch :DATA

def install
virtualenv_install_with_resources
end

test do
python3 = "python3.12"
ENV.prepend_path "PYTHONPATH", libexec/Language::Python.site_packages(python3)

(testpath/"test.hy").write "(print (+ 2 2))"
assert_match "4", shell_output("#{bin}/hy test.hy")

(testpath/"test.py").write shell_output("#{bin}/hy2py test.hy")
assert_match "4", shell_output("#{python3} test.py")
assert_match "4", shell_output("#{libexec}/bin/python test.py")
end
end

__END__
diff --git a/hy/importer.py b/hy/importer.py
index 554281e..f6087c3 100644
--- a/hy/importer.py
+++ b/hy/importer.py
@@ -99,7 +99,7 @@ def _get_code_from_file(run_name, fname=None, hy_src_check=lambda x: x.endswith(
source = f.read().decode("utf-8")
code = compile(source, fname, "exec")

- return (code, fname)
+ return code if sys.version_info >= (3, 12, 6) else (code, fname)


importlib.machinery.SOURCE_SUFFIXES.insert(0, ".hy")
Loading