From d7dded94a9e88c9b9da324f8a1f86be52c11fa47 Mon Sep 17 00:00:00 2001
From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:27:59 +0100
Subject: [PATCH] dvc: remove `six` resource

This is also a dependency of `protobuf`.
---
 Formula/dvc.rb             | 7 ++-----
 pypi_formula_mappings.json | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Formula/dvc.rb b/Formula/dvc.rb
index 0eb85df134f..f9d08eb2dbe 100644
--- a/Formula/dvc.rb
+++ b/Formula/dvc.rb
@@ -6,6 +6,7 @@ class Dvc < Formula
   url "https://files.pythonhosted.org/packages/0f/3b/d51f69c500718eb65875dc8134370d1aedf1983327e284ab1464fc36c85a/dvc-2.1.0.tar.gz"
   sha256 "46cfbf0db27107fb3a2d5c643e3a948bb24539bf165ef70e77ce64283959e481"
   license "Apache-2.0"
+  revision 1
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "b46bdccddfdba0c66b2347139c6c233ac9ab5c0444fc3a06dd9dbf111b6726da"
@@ -23,6 +24,7 @@ class Dvc < Formula
   depends_on "protobuf"
   depends_on "python-tabulate"
   depends_on "python@3.9"
+  depends_on "six"
 
   # When updating, check that the extra packages in pypi_formula_mappings.json
   # correctly reflects the following extra packages in setup.py:
@@ -542,11 +544,6 @@ class Dvc < Formula
     sha256 "7e587e2889b4e51339b6c59c956b3f0eb5194113967d913515025406d5be849c"
   end
 
-  resource "six" do
-    url "https://files.pythonhosted.org/packages/6b/34/415834bfdafca3c5f451532e8a8d9ba89a21c9743a0c59fbd0205c7f9426/six-1.15.0.tar.gz"
-    sha256 "30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"
-  end
-
   resource "smmap" do
     url "https://files.pythonhosted.org/packages/dd/d4/2b4f196171674109f0fbb3951b8beab06cd0453c1b247ec0c4556d06648d/smmap-4.0.0.tar.gz"
     sha256 "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"
diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json
index f9429ba66a0..df57dc4317c 100644
--- a/pypi_formula_mappings.json
+++ b/pypi_formula_mappings.json
@@ -40,10 +40,10 @@
   "diffoscope": "diffoscope[cmdline]",
   "dvc": {
     "extra_packages": [
-        "gcsfs", "pydrive2", "six", "boto3", "adlfs", "azure-identity", "knack",
+        "gcsfs", "pydrive2", "boto3", "adlfs", "azure-identity", "knack",
         "oss2", "pycryptodome", "paramiko[invoke]", "webdavclient3"
     ],
-    "exclude_packages": ["tabulate", "protobuf"]
+    "exclude_packages": ["protobuf", "six", "tabulate"]
   },
   "ipython": {
     "extra_packages": ["ipykernel"]