From ba43b7f94c25668d87e81dd2bb3a7ee8c274d0ca Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Fri, 29 Jul 2022 00:26:41 -0700 Subject: [PATCH] git-cola 4.0.1 Also migrate to `python@3.10` Closes #106847. Signed-off-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/git-cola.rb | 33 ++++++++++++++++++++------------- pypi_formula_mappings.json | 3 +++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Formula/git-cola.rb b/Formula/git-cola.rb index 0590743a0c3..e180a91dfc1 100644 --- a/Formula/git-cola.rb +++ b/Formula/git-cola.rb @@ -1,8 +1,10 @@ class GitCola < Formula + include Language::Python::Virtualenv + desc "Highly caffeinated git GUI" homepage "https://git-cola.github.io/" - url "https://github.com/git-cola/git-cola/archive/v3.12.0.tar.gz" - sha256 "ec1167ea9a472214bf18f5537d96e137c724f3d28a85b3642f07dba35f04b24a" + url "https://files.pythonhosted.org/packages/ee/cb/244839cf29199438c86e0f254f0d131e41ec39074efe6b71d556d121f275/git-cola-4.0.1.tar.gz" + sha256 "5d3abc4cae3eadae6728a69950ae7b467ec2bda4f32c30437bcac34c1a331896" license "GPL-2.0-or-later" head "https://github.com/git-cola/git-cola.git", branch: "main" @@ -15,21 +17,26 @@ class GitCola < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "7b7d769c22c41700d9813222188aca1bfe1f0971526590ad98da4c666059e0b4" end - depends_on "sphinx-doc" => :build depends_on "pyqt@5" - depends_on "python@3.9" + depends_on "python@3.10" - uses_from_macos "rsync" + resource "packaging" do + url "https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c/packaging-21.3.tar.gz" + sha256 "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb" + end + + resource "pyparsing" do + url "https://files.pythonhosted.org/packages/71/22/207523d16464c40a0310d2d4d8926daffa00ac1f5b1576170a32db749636/pyparsing-3.0.9.tar.gz" + sha256 "2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb" + end + + resource "QtPy" do + url "https://files.pythonhosted.org/packages/4f/8b/2830a11f0773dded3bb9943daeed7c1eefb214f84d72a213a5d4681430b2/QtPy-2.1.0.tar.gz" + sha256 "ca8cd4217175186344299ee4c0f7e7adcf362c70852ba35b255a534077025c06" + end def install - # setuptools>=60 prefers its own bundled distutils, which breaks the installation - # Remove when disutils is no longer used: https://github.com/git-cola/git-cola/issues/1201 - ENV["SETUPTOOLS_USE_DISTUTILS"] = "stdlib" - - ENV.delete("PYTHONPATH") - ENV["PYTHON"] = which("python3") - system "make", "prefix=#{prefix}", "install" - system "make", "install-doc", "prefix=#{prefix}", "SPHINXBUILD=#{Formula["sphinx-doc"].opt_bin}/sphinx-build" + virtualenv_install_with_resources end test do diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 340f78ac04c..750a3ea4b39 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -166,6 +166,9 @@ "exclude_packages": ["six"], "extra_packages": ["pyobjc-framework-LocalAuthentication", "SecretStorage", "jeepney"] }, + "git-cola": { + "exclude_packages": ["pyqt5"] + }, "git-remote-codecommit": { "exclude_packages": ["six"] },