From 35a82583de92a0a4f449bbd181910e488fd20aa6 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Thu, 8 Dec 2016 01:44:43 -0800 Subject: [PATCH] httpie: use new virtualenv feature Closes #7665. Signed-off-by: ilovezfs --- Formula/httpie.rb | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Formula/httpie.rb b/Formula/httpie.rb index 5190e0a2f5..bc3fbeed2d 100644 --- a/Formula/httpie.rb +++ b/Formula/httpie.rb @@ -1,8 +1,10 @@ class Httpie < Formula + include Language::Python::Virtualenv + desc "User-friendly cURL replacement (command-line HTTP client)" homepage "https://httpie.org/" - url "https://pypi.python.org/packages/85/95/7ccea3ae7fd1185e21629f6d14fa9c896d6250bb15fb492efa91edc741a2/httpie-0.9.8.tar.gz" - sha256 "515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1" + url "https://github.com/jkbrzt/httpie/archive/0.9.8.tar.gz" + sha256 "5ccc65dd8e60a9310f575c1a9600f3cc7daf8704cc88bf6c40118b3659b98dc7" head "https://github.com/jkbrzt/httpie.git" bottle do @@ -15,30 +17,18 @@ class Httpie < Formula depends_on :python3 - resource "pygments" do - url "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz" + resource "Pygments" do + url "https://files.pythonhosted.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz" sha256 "88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81" end resource "requests" do - url "https://pypi.python.org/packages/d9/03/155b3e67fe35fe5b6f4227a8d9e96a14fda828b18199800d161bcefc1359/requests-2.12.3.tar.gz" + url "https://files.pythonhosted.org/packages/d9/03/155b3e67fe35fe5b6f4227a8d9e96a14fda828b18199800d161bcefc1359/requests-2.12.3.tar.gz" sha256 "de5d266953875e9647e37ef7bfe6ef1a46ff8ddfe61b5b3652edf7ea717ee2b2" end def install - pyver = Language::Python.major_minor_version "python3" - ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{pyver}/site-packages" - %w[pygments requests].each do |r| - resource(r).stage do - system "python3", *Language::Python.setup_install_args(libexec/"vendor") - end - end - - ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{pyver}/site-packages" - system "python3", *Language::Python.setup_install_args(libexec) - - bin.install Dir["#{libexec}/bin/*"] - bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"]) + virtualenv_install_with_resources end test do