From 50707cf93f89ceac6243000207055175cce461e0 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Tue, 1 Nov 2016 23:10:51 -0700 Subject: [PATCH] watson 1.4.0 use new virtualenv feature Closes #6500. Signed-off-by: ilovezfs --- Formula/watson.rb | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/Formula/watson.rb b/Formula/watson.rb index 1976fe9321..0c522673db 100644 --- a/Formula/watson.rb +++ b/Formula/watson.rb @@ -1,9 +1,10 @@ class Watson < Formula + include Language::Python::Virtualenv + desc "Command-line tool to track (your) time" homepage "https://tailordev.github.io/Watson/" - url "https://pypi.python.org/packages/source/t/td-watson/td-watson-1.3.2.tar.gz" - sha256 "f92f3b33595f3e31bb0417b6443541f036bd7dabea19daf471fe5c3ac75b9c8d" - + url "https://files.pythonhosted.org/packages/e9/23/76b5770d759d6cd6865721cd83ff1f2df0c30212f2b22f4769a75c2b0b47/td-watson-1.4.0.tar.gz" + sha256 "189ec0be843a07e6978586f4b802c97f82e08e6a5ac9631bc0bb4a901279c0df" head "https://github.com/TailorDev/Watson.git" bottle do @@ -14,46 +15,35 @@ class Watson < Formula sha256 "5e57982340da15e3e58642c7be8f3f9d3b9239f8433bf8bf680a968efc050cd8" => :mavericks end - depends_on :python if MacOS.version <= :snow_leopard + depends_on :python resource "arrow" do - url "https://pypi.python.org/packages/source/a/arrow/arrow-0.7.0.tar.gz" - sha256 "2a5333007af117a05a488b69c9ae15c26c23eefa25f084992b025d387e03a17b" + url "https://files.pythonhosted.org/packages/58/91/21d65af4899adbcb4158c8f0def8ce1a6d18ddcd8bbb3f5a3800f03b9308/arrow-0.8.0.tar.gz" + sha256 "b210c17d6bb850011700b9f54c1ca0eaf8cbbd441f156f0cd292e1fbda84e7af" end resource "click" do - url "https://pypi.python.org/packages/source/c/click/click-6.2.tar.gz" - sha256 "fba0ff70f5ebb4cebbf64c40a8fbc222fb7cf825237241e548354dabe3da6a82" + url "https://files.pythonhosted.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz" + sha256 "cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9" end resource "python-dateutil" do - url "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.2.tar.gz" - sha256 "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d" + url "https://files.pythonhosted.org/packages/3e/f5/aad82824b369332a676a90a8c0d1e608b17e740bbb6aeeebca726f17b902/python-dateutil-2.5.3.tar.gz" + sha256 "1408fdb07c6a1fa9997567ce3fcee6a337b39a503d80699e0f213de4aa4b32ed" end resource "requests" do - url "https://pypi.python.org/packages/source/r/requests/requests-2.9.1.tar.gz" - sha256 "c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f" + url "https://files.pythonhosted.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz" + sha256 "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133" end resource "six" do - url "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz" + url "https://files.pythonhosted.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz" sha256 "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a" end def install - ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages" - resources.each do |r| - r.stage do - system "python", *Language::Python.setup_install_args(libexec/"vendor") - end - end - - ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages" - system "python", *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