From 63756809ecc4aaef08390b71e80939f0bb005284 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sat, 28 Dec 2024 16:58:26 +0000 Subject: [PATCH 1/2] icloudpd 1.25.1 icloudpd: remove build patch Signed-off-by: Rui Chen icloudpd: update resources Signed-off-by: Patrick Linnane --- Formula/i/icloudpd.rb | 93 ++++++++++++++------------------------ pypi_formula_mappings.json | 3 ++ 2 files changed, 36 insertions(+), 60 deletions(-) diff --git a/Formula/i/icloudpd.rb b/Formula/i/icloudpd.rb index 4babf57d97906..84e712bd739a9 100644 --- a/Formula/i/icloudpd.rb +++ b/Formula/i/icloudpd.rb @@ -5,8 +5,8 @@ class Icloudpd < Formula homepage "https://github.com/icloud-photos-downloader/icloud_photos_downloader" # We use a git checkout as scripts/patch_version runs git commands to update SHA url "https://github.com/icloud-photos-downloader/icloud_photos_downloader.git", - tag: "v1.25.0", - revision: "96f945150b4b21aede0ffdc9c5f5c202a3585dc3" + tag: "v1.25.1", + revision: "fc02ed2321a94973666a9b4378a2ae6b74e111c2" license "MIT" head "https://github.com/icloud-photos-downloader/icloud_photos_downloader.git", branch: "master" @@ -19,6 +19,7 @@ class Icloudpd < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "afc42888ed9148a99a346bc099a48b470d40bc8a629868c17956cb48146b073c" end + depends_on "certifi" depends_on "python@3.13" on_macos do @@ -30,29 +31,19 @@ class Icloudpd < Formula sha256 "b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf" end - resource "certifi" do - url "https://files.pythonhosted.org/packages/37/f7/2b1b0ec44fdc30a3d31dfebe52226be9ddc40cd6c0f34ffc8923ba423b69/certifi-2022.12.7.tar.gz" - sha256 "35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3" - end - resource "charset-normalizer" do - url "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz" - sha256 "223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e" + url "https://files.pythonhosted.org/packages/16/b0/572805e227f01586461c80e0fd25d65a2115599cc9dad142fee4b747c357/charset_normalizer-3.4.1.tar.gz" + sha256 "44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3" end resource "click" do - url "https://files.pythonhosted.org/packages/72/bd/fedc277e7351917b6c4e0ac751853a97af261278a4c7808babafa8ef2120/click-8.1.6.tar.gz" - sha256 "48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd" - end - - resource "contextlib2" do - url "https://files.pythonhosted.org/packages/c7/13/37ea7805ae3057992e96ecb1cffa2fa35c2ef4498543b846f90dd2348d8f/contextlib2-21.6.0.tar.gz" - sha256 "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869" + url "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz" + sha256 "ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a" end resource "flask" do - url "https://files.pythonhosted.org/packages/41/e1/d104c83026f8d35dfd2c261df7d64738341067526406b40190bc063e829a/flask-3.0.3.tar.gz" - sha256 "ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842" + url "https://files.pythonhosted.org/packages/89/50/dff6380f1c7f84135484e176e0cac8690af72fa90e932ad2a0a60e28c69b/flask-3.1.0.tar.gz" + sha256 "5f873c5184c897c8d9d1b05df1e3d01b14910ce69607a117bd3277098a5836ac" end resource "idna" do @@ -81,18 +72,18 @@ class Icloudpd < Formula end resource "jinja2" do - url "https://files.pythonhosted.org/packages/ed/55/39036716d19cab0747a5020fc7e907f362fbf48c984b14e62127f7e68e5d/jinja2-3.1.4.tar.gz" - sha256 "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369" + url "https://files.pythonhosted.org/packages/af/92/b3130cbbf5591acf9ade8708c365f3238046ac7cb8ccba6e81abccb0ccff/jinja2-3.1.5.tar.gz" + sha256 "8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb" end resource "keyring" do - url "https://files.pythonhosted.org/packages/3e/e9/54f232e659f635a000d94cfbca40b9d5d617707593c3d552ec14d3ba27f1/keyring-25.2.1.tar.gz" - sha256 "daaffd42dbda25ddafb1ad5fec4024e5bbcfe424597ca1ca452b299861e49f1b" + url "https://files.pythonhosted.org/packages/70/09/d904a6e96f76ff214be59e7aa6ef7190008f52a0ab6689760a98de0bf37d/keyring-25.6.0.tar.gz" + sha256 "0b39998aa941431eb3d9b0d4b2460bc773b9df6fed7621c2dfb291a7e0187a66" end resource "keyrings-alt" do - url "https://files.pythonhosted.org/packages/4f/55/7a52c9961f607353034945692c700ab648f18ea2ab2d509e248b24cb0a91/keyrings.alt-5.0.1.tar.gz" - sha256 "cd372a1ec446a1bc5a90624a52c88e83b9330218e39047a6c9a48ae37d116745" + url "https://files.pythonhosted.org/packages/5c/7b/e3bf53326e0753bee11813337b1391179582ba5c6851b13e0d9502d15a50/keyrings_alt-5.0.2.tar.gz" + sha256 "8f097ebe9dc8b185106502b8cdb066c926d2180e13b4689fd4771a3eab7d69fb" end resource "markupsafe" do @@ -116,23 +107,23 @@ class Icloudpd < Formula end resource "pytz" do - url "https://files.pythonhosted.org/packages/90/26/9f1f00a5d021fff16dee3de13d43e5e978f3d58928e129c3a62cf7eb9738/pytz-2024.1.tar.gz" - sha256 "2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812" + url "https://files.pythonhosted.org/packages/3a/31/3c70bf7603cc2dca0f19bdc53b4537a797747a58875b552c8c413d963a3f/pytz-2024.2.tar.gz" + sha256 "2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a" end resource "requests" do - url "https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3/requests-2.31.0.tar.gz" - sha256 "942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" + url "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz" + sha256 "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" end resource "schema" do - url "https://files.pythonhosted.org/packages/4e/e8/01e1b46d9e04cdaee91c9c736d9117304df53361a191144c8eccda7f0ee9/schema-0.7.5.tar.gz" - sha256 "f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197" + url "https://files.pythonhosted.org/packages/d4/01/0ea2e66bad2f13271e93b729c653747614784d3ebde219679e41ccdceecd/schema-0.7.7.tar.gz" + sha256 "7da553abd2958a19dc2547c388cde53398b39196175a9be59ea1caf5ab0a1807" end resource "six" do - url "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" - sha256 "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926" + url "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz" + sha256 "ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" end resource "srp" do @@ -141,28 +132,28 @@ class Icloudpd < Formula end resource "tqdm" do - url "https://files.pythonhosted.org/packages/5a/c0/b7599d6e13fe0844b0cda01b9aaef9a0e87dbb10b06e4ee255d3fa1c79a2/tqdm-4.66.4.tar.gz" - sha256 "e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb" + url "https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d/tqdm-4.67.1.tar.gz" + sha256 "f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2" end resource "typing-extensions" do - url "https://files.pythonhosted.org/packages/f6/f3/b827b3ab53b4e3d8513914586dcca61c355fa2ce8252dea4da56e67bf8f2/typing_extensions-4.11.0.tar.gz" - sha256 "83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0" + url "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz" + sha256 "1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" end resource "tzlocal" do - url "https://files.pythonhosted.org/packages/b2/e2/adf17c75bab9b33e7f392b063468d50e513b2921bbae7343eb3728e0bc0a/tzlocal-5.1.tar.gz" - sha256 "a5ccb2365b295ed964e0a98ad076fe10c495591e75505d34f154d60a7f1ed722" + url "https://files.pythonhosted.org/packages/04/d3/c19d65ae67636fe63953b20c2e4a8ced4497ea232c43ff8d01db16de8dc0/tzlocal-5.2.tar.gz" + sha256 "8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e" end resource "urllib3" do - url "https://files.pythonhosted.org/packages/e2/7d/539e6f0cf9f0b95b71dd701a56dae89f768cd39fd8ce0096af3546aeb5a3/urllib3-1.26.16.tar.gz" - sha256 "8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14" + url "https://files.pythonhosted.org/packages/e4/e8/6ff5e6bc22095cfc59b6ea711b687e2b7ed4bdb373f7eeec370a97d7392f/urllib3-1.26.20.tar.gz" + sha256 "40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32" end resource "waitress" do - url "https://files.pythonhosted.org/packages/70/34/cb77e5249c433eb177a11ab7425056b32d3b57855377fa1e38b397412859/waitress-3.0.0.tar.gz" - sha256 "005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1" + url "https://files.pythonhosted.org/packages/bf/cb/04ddb054f45faa306a230769e868c28b8065ea196891f09004ebace5b184/waitress-3.0.2.tar.gz" + sha256 "682aaaf2af0c44ada4abfb70ded36393f0e307f4ab9456a215ce0020baefc31f" end resource "werkzeug" do @@ -170,9 +161,6 @@ class Icloudpd < Formula sha256 "60723ce945c19328679790e3282cc758aa4a6040e4bb330f53d30fa546d44746" end - # support python 3.13 - patch :DATA - def install ENV.prepend_path "PATH", Formula["gnu-sed"].libexec/"gnubin" if OS.mac? # https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/922#issuecomment-2252928501 @@ -188,18 +176,3 @@ def install assert_match "Authenticating...", output end end - -__END__ -diff --git a/pyproject.toml b/pyproject.toml -index 5e60ee9..fb85dac 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -10,7 +10,7 @@ version="1.23.4" - name = "icloudpd" - description = "icloudpd is a command-line tool to download photos and videos from iCloud." - readme = "README_PYPI.md" --requires-python = ">=3.8,<3.13" -+requires-python = ">=3.8,<3.14" - keywords = ["icloud", "photo"] - license = {file="LICENSE.md"} - authors=[ diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index e6fa8e357a9dd..6a8f8c16dc2cd 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -436,6 +436,9 @@ "huggingface-cli": { "exclude_packages": ["certifi"] }, + "icloudpd": { + "exclude_packages": ["certifi"] + }, "iconsur": { "package_name": "", "extra_packages": ["pyobjc-core", "pyobjc-framework-cocoa"] From 02896c49efc44a7794686ccfb7b3425a4d70b633 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:06:52 +0000 Subject: [PATCH 2/2] icloudpd: update 1.25.1 bottle. --- Formula/i/icloudpd.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Formula/i/icloudpd.rb b/Formula/i/icloudpd.rb index 84e712bd739a9..2b5137c36252a 100644 --- a/Formula/i/icloudpd.rb +++ b/Formula/i/icloudpd.rb @@ -11,12 +11,12 @@ class Icloudpd < Formula head "https://github.com/icloud-photos-downloader/icloud_photos_downloader.git", branch: "master" bottle do - sha256 cellar: :any_skip_relocation, arm64_sequoia: "0bf72728107c38a0f05ed14f3fc759a29d2b81dcb6a65a8362bf86a3b30bf26e" - sha256 cellar: :any_skip_relocation, arm64_sonoma: "0aed2ac1a5f2df18e28b35b68ef0baadf87028e930f396f4450aed24cfd8b053" - sha256 cellar: :any_skip_relocation, arm64_ventura: "52d77444213c09fe1161f357b49958b8a5612b4b6389754ad87cf921ebe92c78" - sha256 cellar: :any_skip_relocation, sonoma: "c941f5382de5147860001158b43c92dc5afb3287172c0d53ca78622c3e33cadc" - sha256 cellar: :any_skip_relocation, ventura: "d73ee636fb9cb52cb99444c948dd35a9162a3e28111eb74518e68700f785ae08" - sha256 cellar: :any_skip_relocation, x86_64_linux: "afc42888ed9148a99a346bc099a48b470d40bc8a629868c17956cb48146b073c" + sha256 cellar: :any_skip_relocation, arm64_sequoia: "5d4f0f32faa27ac14274b09e2927688e1ed03b906518d7b4655fa8dc4c018993" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "631a502d98e8bd64678010e525b5615f49aec2018f0fb34409685de9c9bfd1f3" + sha256 cellar: :any_skip_relocation, arm64_ventura: "0abe45605dba6ae728b8081c1966700d3310902622ee523830afeaf1f7b82253" + sha256 cellar: :any_skip_relocation, sonoma: "c60cc4bfc73911065ed94b254f638343b5eda3b3bd5d03d7161cf580f988289e" + sha256 cellar: :any_skip_relocation, ventura: "4493da23c79f36e7f1404eecc8b29549f60fe6e304b8b0294dde33858eb75faf" + sha256 cellar: :any_skip_relocation, x86_64_linux: "0d306a22f17d9117eb4668412b9c52791a6fff2552bde33887687ad4c9ce5c5f" end depends_on "certifi"