From eb94e4b462199c648b32cabf65d15b223699a5a5 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 21 Sep 2021 23:33:52 -0400 Subject: [PATCH] conan 1.40.2 Closes #85706. Signed-off-by: Dustin Rodrigues Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/conan.rb | 18 +++++++----------- pypi_formula_mappings.json | 3 +++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Formula/conan.rb b/Formula/conan.rb index 5b517d53620..233d76531e7 100644 --- a/Formula/conan.rb +++ b/Formula/conan.rb @@ -3,8 +3,8 @@ class Conan < Formula desc "Distributed, open source, package manager for C/C++" homepage "https://conan.io" - url "https://files.pythonhosted.org/packages/8d/b4/d2b7844886b7eeb0c61d6397e0e89c684d48a7ad03c8a442a025ed94c7f3/conan-1.40.1.tar.gz" - sha256 "d03a2e8427fbeebf16bf2326aa5265ea6fa02b8ba54471bea7e1a129092a266e" + url "https://files.pythonhosted.org/packages/f6/62/0a978b762933b6c15db8b4f9c0e2d748f24d104084d22a940eef88500dc3/conan-1.40.2.tar.gz" + sha256 "2dde4e484261f588167a2789874d26f518f13dab3217062d5cecd89f106cd181" license "MIT" head "https://github.com/conan-io/conan.git", branch: "develop" @@ -21,6 +21,7 @@ class Conan < Formula depends_on "libffi" depends_on "openssl@1.1" depends_on "python@3.9" + depends_on "six" resource "bottle" do url "https://files.pythonhosted.org/packages/ea/80/3d2dca1562ffa1929017c74635b4cb3645a352588de89e90d0bb53af3317/bottle-0.12.19.tar.gz" @@ -33,8 +34,8 @@ class Conan < Formula end resource "charset-normalizer" do - url "https://files.pythonhosted.org/packages/68/32/95ddb68b9abeb89efd461852cdff5791d42fc5e4c528536f541091ffded3/charset-normalizer-2.0.5.tar.gz" - sha256 "7098e7e862f6370a2a8d1a6398cd359815c45d12626267652c3f13dec58e2367" + url "https://files.pythonhosted.org/packages/eb/7f/a6c278746ddbd7094b019b08d1b2187101b1f596f35f81dc27f57d8fcf7c/charset-normalizer-2.0.6.tar.gz" + sha256 "5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f" end resource "colorama" do @@ -112,14 +113,9 @@ class Conan < Formula sha256 "b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" end - resource "six" do - url "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" - sha256 "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926" - end - resource "tqdm" do - url "https://files.pythonhosted.org/packages/37/e5/1b54ef934d731576d0145bc8ae22da5b410f96922cec52b91cc29d3ff1b6/tqdm-4.62.2.tar.gz" - sha256 "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5" + url "https://files.pythonhosted.org/packages/e3/c1/b3e42d5b659ca598508e2a9ef315d5eef0a970f874ef9d3b38d4578765bd/tqdm-4.62.3.tar.gz" + sha256 "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d" end resource "urllib3" do diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index f00a0543def..050be3ef71d 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -59,6 +59,9 @@ "exclude_packages": ["junit-xml", "six", "tabulate"], "extra_packages": ["junit-xml-2"] }, + "conan": { + "exclude_packages": ["six"] + }, "datalad": { "exclude_packages": ["six"] },