From 80058e789a48c67472ecbb09e020fcc1f1f93f92 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Tue, 7 Mar 2017 05:46:28 -0800 Subject: [PATCH] eralchemy 1.1.0 use new virtualenv feature Closes #10685. Signed-off-by: ilovezfs --- Formula/eralchemy.rb | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/Formula/eralchemy.rb b/Formula/eralchemy.rb index c2f0430c8e0..0b842ab6574 100644 --- a/Formula/eralchemy.rb +++ b/Formula/eralchemy.rb @@ -1,9 +1,10 @@ class Eralchemy < Formula + include Language::Python::Virtualenv + desc "Simple entity relation (ER) diagrams generation" homepage "https://github.com/Alexis-benoist/eralchemy" - url "https://pypi.python.org/packages/source/E/ERAlchemy/ERAlchemy-1.0.1.tar.gz" - sha256 "98425b21fe0f12ff33e72789c8a308baa1c2d5fdf157388162deaa510551da4f" - revision 1 + url "https://files.pythonhosted.org/packages/f8/84/a7e4b73a427425e8d2d0446b6e94320e7ab4c44abe29c66150a7ee14f981/ERAlchemy-1.1.0.tar.gz" + sha256 "29ed9d0b865196e428955a3e9f1e1ce4a8e2ce2855aa58f6aaab97991e8407ba" bottle do cellar :any @@ -20,43 +21,37 @@ class Eralchemy < Formula depends_on :postgresql => :optional resource "pygraphviz" do - url "https://pypi.python.org/packages/source/p/pygraphviz/pygraphviz-1.3.1.tar.gz" + url "https://files.pythonhosted.org/packages/98/bb/a32e33f7665b921c926209305dde66fe41003a4ad934b10efb7c1211a419/pygraphviz-1.3.1.tar.gz" sha256 "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408" end resource "SQLAlchemy" do - url "https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.0.11.tar.gz" - sha256 "0b24729787fa1455009770880ea32b1fa5554e75170763b1aef8b1eb470de8a3" + url "https://files.pythonhosted.org/packages/24/de/66d96cbad7a91443af1399469e9aa0aec8a41669ba6d0faae8b8411ddb27/SQLAlchemy-1.1.6.tar.gz" + sha256 "815924e3218d878ddd195d2f9f5bf3d2bb39fabaddb1ea27dace6ac27d9865e4" end resource "psycopg2" do - url "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.6.1.tar.gz" - sha256 "6acf9abbbe757ef75dc2ecd9d91ba749547941abaffbe69ff2086a9e37d4904c" + url "https://files.pythonhosted.org/packages/62/ca/0a479c9664526e86c2913a7ad593586eeb86b428b7e629e7c7b6b69e3cb7/psycopg2-2.7.tar.gz" + sha256 "ceadecf660ad4f7a31ea5baef30a7351add8626f9fd3daaafabb9a9e549f3f9a" end resource "er_example" do - url "https://raw.githubusercontent.com/Alexis-benoist/eralchemy/v1.0.1/example/newsmeme.er" + url "https://raw.githubusercontent.com/Alexis-benoist/eralchemy/v1.1.0/example/newsmeme.er" sha256 "5c475bacd91a63490e1cbbd1741dc70a3435e98161b5b9458d195ee97f40a3fa" end def install - ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages" - %w[pygraphviz SQLAlchemy].each do |r| - resource(r).stage do - system "python", *Language::Python.setup_install_args(libexec/"vendor") - end + venv = virtualenv_create(libexec) + + res = resources.map(&:name).to_set - ["er_example", "psycopg2"] + + res.each do |r| + venv.pip_install resource(r) end - if build.with?("postgresql") - resource("psycopg2").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) + venv.pip_install resource("psycopg2") if build.with? "postgresql" - bin.install Dir[libexec/"bin/*"] - bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"]) + venv.pip_install_and_link buildpath end test do