From 4a156c75178f26deb062d529e709bead40cc31b8 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Sun, 29 Dec 2024 01:55:16 +0800 Subject: [PATCH] dvc: use `pygit2` This will allow us to avoid having to rebuild this on `libgit2` version bumps. --- Formula/d/dvc.rb | 10 +++------- pypi_formula_mappings.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Formula/d/dvc.rb b/Formula/d/dvc.rb index 63246ad1c6017f..863e038b5616b0 100644 --- a/Formula/d/dvc.rb +++ b/Formula/d/dvc.rb @@ -6,7 +6,7 @@ class Dvc < Formula url "https://files.pythonhosted.org/packages/27/05/5c173feb1a2ff16c03a85f0ff2dad1bfcd22c8a7e9d5bf198a18cefb4ac0/dvc-3.58.0.tar.gz" sha256 "cd078b2916841dbb8ac0cf0aec9db723b11117651af53028d288b6a9a87b7399" license "Apache-2.0" - revision 1 + revision 2 bottle do sha256 cellar: :any, arm64_sequoia: "6c829320837208bc3cf199ff0631d543a52644911e3e43f1fc77860a19c74517" @@ -18,15 +18,16 @@ class Dvc < Formula end depends_on "cmake" => :build # for pyarrow + depends_on "maturin" => :build depends_on "ninja" => :build # for pyarrow depends_on "openjdk" => :build # for hydra-core depends_on "rust" => :build # for bcrypt depends_on "apache-arrow" depends_on "certifi" depends_on "cryptography" - depends_on "libgit2" depends_on "libyaml" depends_on "numpy" + depends_on "pygit2" depends_on "python@3.13" on_linux do @@ -633,11 +634,6 @@ class Dvc < Formula sha256 "649b84d60c637bc7146485039535aa8f1254ad156423739f07e5d32507447c13" end - resource "pygit2" do - url "https://files.pythonhosted.org/packages/a4/85/c848cdf44214bf541c4a725a0a6e271f8db9f18cfccef702d53f83f1e19a/pygit2-1.16.0.tar.gz" - sha256 "7b29a6796baa15fc89d443ac8d51775411d9b1e5b06dc40d458c56c8576b48a2" - end - resource "pygments" do url "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz" sha256 "786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199" diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index 4c92c09d326238..bfa932aa6427a4 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -288,7 +288,7 @@ }, "dvc": { "package_name": "dvc[all]", - "exclude_packages": ["certifi", "cryptography", "numpy"] + "exclude_packages": ["certifi", "cryptography", "numpy", "pygit2"] }, "dxpy": { "exclude_packages": ["cryptography", "certifi"]