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

charm-tools: build with pyyaml6 #137368

Merged
merged 2 commits into from
Jul 26, 2023
Merged

charm-tools: build with pyyaml6 #137368

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be276da
charm-tools: build with pyyaml6
chenrui333 Jul 23, 2023
31bf5a2
charm-tools: update 3.0.6_3 bottle.
BrewTestBot Jul 26, 2023
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
12 changes: 7 additions & 5 deletions Formula/charm-tools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class CharmTools < Formula
depends_on "libyaml"
depends_on "openssl@3"
depends_on "[email protected]"
depends_on "pyyaml"
depends_on "six"

on_linux do
Expand Down Expand Up @@ -167,11 +168,6 @@ class CharmTools < Formula
sha256 "f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"
end

resource "pyyaml" do
url "https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d/PyYAML-5.4.1.tar.gz"
sha256 "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"
end

resource "referencing" do
url "https://files.pythonhosted.org/packages/20/93/45213b5b6e3eeab03e3f6eb82cc516a81fbf257586a25f9eb1d21af96e1b/referencing-0.29.1.tar.gz"
sha256 "90cb53782d550ba28d2166ef3f55731f38397def8832baac5d45235f1995e35e"
Expand Down Expand Up @@ -247,6 +243,12 @@ class CharmTools < Formula
sha256 "ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147"
end

# Add cython 3+ patch for pyyaml
patch do
url "https://github.com/juju/charm-tools/commit/1a2009adff40067e555435ca58936509b9781764.patch?full_index=1"
sha256 "cb060c8a7825c1ada309b1b663744dfb5b22f6349f52043d04d751dae63c6871"
end

def install
# Ensure that the `openssl` crate picks up the intended library.
ENV["OPENSSL_DIR"] = Formula["openssl@3"].opt_prefix
Expand Down