From be1bc90e1234ef81720c73ea83ad9cda0b236f15 Mon Sep 17 00:00:00 2001
From: Joel Natividad <1980690+jqnatividad@users.noreply.github.com>
Date: Tue, 15 Oct 2024 06:26:33 -0400
Subject: [PATCH] `deps`: use publicsuffix upstream with unreleased dependency
 bumps; alpha-sort patch section

gets rid of old idna 0.3.0 dependency
---
 Cargo.lock | 16 +++-------------
 Cargo.toml | 13 +++++++++----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2ebd25ff..e5f5ac525 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3216,16 +3216,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -5363,10 +5353,9 @@ dependencies = [
 [[package]]
 name = "publicsuffix"
 version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+source = "git+https://github.com/rushmorem/publicsuffix?rev=b300356#b30035623f75d8122c222058eff48835078276f4"
 dependencies = [
- "idna 0.3.0",
+ "idna 0.5.0",
  "psl-types",
 ]
 
@@ -5501,6 +5490,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "phf 0.11.2",
  "polars",
+ "publicsuffix",
  "pyo3",
  "qsv-dateparser",
  "qsv-sniffer",
diff --git a/Cargo.toml b/Cargo.toml
index 9cfe02587..8bd0f2363 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,6 +172,7 @@ polars = { version = "0.43", features = [
     "streaming",
     "timezones",
 ], optional = true }
+publicsuffix = { version = "2.2", optional = true }
 pyo3 = { version = "0.22", features = [
     "auto-initialize",
     "gil-refs",
@@ -287,20 +288,23 @@ csvlens = { git = "https://github.com/jqnatividad/csvlens", branch = "bump-depen
 # see https://github.com/jan-auer/dynfmt/pull/9
 dynfmt = { git = "https://github.com/jqnatividad/dynfmt", branch = "2021-clippy_ptr_as_ptr-bumpdeps" }
 
+# use our fork of governor with bumped dashmap dependency
+governor = { git = "https://github.com/jqnatividad/governor", branch = "deps-bump-dashmap" }
+
 # needed to get latest dependencies and unreleased fixes
 grex = { git = "https://github.com/pemistahl/grex", rev = "ff8533d" }
 
 # use modernized version of local_encoding
 local-encoding = { git = "https://github.com/slonopotamus/local-encoding-rs", branch = "travis-madness" }
 
-# use of fork of xlsxwriter with bumped bindgen dependency
-xlsxwriter = { git = "https://github.com/jqnatividad/xlsxwriter-rs", branch = "bump-bindgen-to-0.70.1" }
+# use upstream publicsuffix with unreleased dependency bumps
+publicsuffix = { git = "https://github.com/rushmorem/publicsuffix", rev = "b300356" }
 
 # use serde_json with unreleased optimizations
 serde_json = { git = "https://github.com/serde-rs/json", rev = "faab2e8" }
 
-# use our fork of governor with bumped dashmap dependency
-governor = { git = "https://github.com/jqnatividad/governor", branch = "deps-bump-dashmap" }
+# use of fork of xlsxwriter with bumped bindgen dependency
+xlsxwriter = { git = "https://github.com/jqnatividad/xlsxwriter-rs", branch = "bump-bindgen-to-0.70.1" }
 
 # Polars has a much higher release tempo for its Python bindings compared
 # to its underlying Rust library. See https://github.com/pola-rs/polars/releases
@@ -353,6 +357,7 @@ fetch = [
     "governor",
     "hashbrown",
     "jql-runner",
+    "publicsuffix",
     "redis",
     "serde_stacker",
     "serde_urlencoded",