onionprobe: migrate to [email protected]

Formula/o/onionprobe.rb

@@ -9,35 +9,34 @@ class Onionprobe < Formula
   head "https://gitlab.torproject.org/tpo/onion-services/onionprobe.git", branch: "main"
 
   bottle do
-    sha256 cellar: :any,                 arm64_tahoe:   "adb87a0ad58b774185a34ab3650f92006728226bda208440b81d0f5536906c95"
-    sha256 cellar: :any,                 arm64_sequoia: "a3b51ab0c45c28282ff0592ff3bd1c9a74ceeda26609cd2f067e9c837e3895f3"
-    sha256 cellar: :any,                 arm64_sonoma:  "dbaff55faea244b4f13c96dc1d39f971ba592d9c448a2394e513a988e902742f"
-    sha256 cellar: :any,                 arm64_ventura: "fc6f4d6ae60f853bdaed891063d53dd6e1b3ae218498d97a586087fe0712d6ec"
-    sha256 cellar: :any,                 sonoma:        "f60ba493290ddeb5a5aa90d233a2d7e81f13b07cb2b5d99d66aadec7c49bc493"
-    sha256 cellar: :any,                 ventura:       "3f76341c4c7d240c7084b1c93b0cdf2edd03151acd84902f3ad6fbb406b7697c"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "fc8c2397e8cba048232f2962eef64bc0170c6d876116a9aa17cffab41dfce323"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "35fa7574d64bb7d7f1e4982ce041e47ae34e0ec599c3ec8bed32cb22af7f51f5"
+    rebuild 1
+    sha256 cellar: :any,                 arm64_tahoe:   "81621589fe463b9ca930d0b4d7e574b12a74b46a392712d8079c00dfa49102be"
+    sha256 cellar: :any,                 arm64_sequoia: "6827f95de7ece5a165888562052621589c3f0dad6def3bf1659367152d1ef05e"
+    sha256 cellar: :any,                 arm64_sonoma:  "a60e98ac2e06c91223922ea176967b3789ba1e8a6f5cf0045d38ad85f17e1e0a"
+    sha256 cellar: :any,                 sonoma:        "c364a4fb1d477a8c5ffcf55868c4e22f5c6ee006c981b59526a4ffae371f0607"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "bcc1b0a72418a251f5d170ce859bcc5ec91e804234a84426f60c43ed7b4b6eda"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "83bdb2939b2d933b887cefa17156d2a11f889bbd633e8f43d36a7dfd1c804deb"
   end
 
-  depends_on "certifi"
-  depends_on "cryptography"
+  depends_on "certifi" => :no_linkage
+  depends_on "cryptography" => :no_linkage
   depends_on "libyaml"
-  depends_on "python@3.13"
+  depends_on "python@3.14"
   depends_on "tor"
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz"
-    sha256 "5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63"
+    url "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz"
+    sha256 "94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a"
   end
 
   resource "idna" do
-    url "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz"
-    sha256 "12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"
+    url "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz"
+    sha256 "795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902"
   end
 
   resource "prometheus-client" do
-    url "https://files.pythonhosted.org/packages/5e/cf/40dde0a2be27cc1eb41e333d1a674a74ce8b8b0457269cc640fd42b07cf7/prometheus_client-0.22.1.tar.gz"
-    sha256 "190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28"
+    url "https://files.pythonhosted.org/packages/23/53/3edb5d68ecf6b38fcbcc1ad28391117d2a322d9a1a3eff04bfdb184d8c3b/prometheus_client-0.23.1.tar.gz"
+    sha256 "6ae8f9081eaaaf153a2e959d2e6c4f4fb57b12ef76c8c7980202f1e57b48b2ce"
   end
 
   resource "pysocks" do
@@ -46,13 +45,13 @@ class Onionprobe < Formula
   end
 
   resource "pyyaml" do
-    url "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz"
-    sha256 "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
+    url "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz"
+    sha256 "d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f"
   end
 
   resource "requests" do
-    url "https://files.pythonhosted.org/packages/e1/0a/929373653770d8a0d7ea76c37de6e41f11eb07559b103b1c02cafb3f7cf8/requests-2.32.4.tar.gz"
-    sha256 "27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"
+    url "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz"
+    sha256 "dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"
   end
 
   resource "stem" do
@@ -65,6 +64,10 @@ class Onionprobe < Formula
     sha256 "3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760"
   end
 
+  # Fix to support Python 3.14
+  # Issue ref: https://gitlab.torproject.org/tpo/onion-services/onionprobe/-/issues/116
+  patch :DATA
+
   def install
     virtualenv_install_with_resources
   end
@@ -76,3 +79,24 @@ def install
     assert_match "Status code is 200", output
   end
 end
+
+__END__
+diff --git a/packages/onionprobe/config.py b/packages/onionprobe/config.py
+index 9414f3f..bb9c832 100644
+--- a/packages/onionprobe/config.py
++++ b/packages/onionprobe/config.py
+@@ -277,7 +277,13 @@ def cmdline_parser():
+             parser.add_argument('-e', '--endpoints', nargs='*', help='Add endpoints to the test list', metavar="ONION-ADDRESS1")
+
+         else:
+-            config[argument]['type'] = type(config[argument]['default'])
++            import argparse as _argparse
++            if isinstance(config[argument].get('default'), bool):
++                config[argument].pop('type', None)
++                config[argument].pop('metavar', None)
++                config[argument]['action'] = _argparse.BooleanOptionalAction
++            else:
++                config[argument]['type'] = type(config[argument]['default'])
+
+             if not isinstance(config[argument]['default'], bool) and config[argument]['default'] != '':
+                 config[argument]['help'] += ' (default: %(default)s)'