Skip to content

Commit

Permalink
Merge pull request #178783 from branchvincent/awscli
Browse files Browse the repository at this point in the history
awscli: remove stale workaround
  • Loading branch information
p-linnane authored Jul 28, 2024
2 parents a093e0f + 72a48df commit 6c1bee2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Formula/a/awscli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@ def install
ENV.append_to_cflags "-Wno-incompatible-function-pointer-types" if DevelopmentTools.clang_build_version >= 1500

venv = virtualenv_create(libexec, python3, system_site_packages: false)
venv.pip_install resources.reject { |r| r.name == "awscrt" }
# The `awscrt` resource requires `setuptools` & `wheel`, so they must be installed first
venv.pip_install resource("awscrt")
venv.pip_install resources
venv.pip_install_and_link buildpath, build_isolation: false

pkgshare.install "awscli/examples"
Expand Down Expand Up @@ -151,6 +149,6 @@ def caveats
test do
assert_match "topics", shell_output("#{bin}/aws help")
site_packages = libexec/Language::Python.site_packages(python3)
assert_includes Dir[site_packages/"awscli/data/*"], "#{site_packages}/awscli/data/ac.index"
assert_includes site_packages.glob("awscli/data/*"), site_packages/"awscli/data/ac.index"
end
end

0 comments on commit 6c1bee2

Please sign in to comment.