From ccdc3e1c477c666640fd8d6c562afb87554c83db Mon Sep 17 00:00:00 2001
From: Nick Sweeting <github@sweeting.me>
Date: Sat, 5 Oct 2024 16:37:40 -0700
Subject: [PATCH] add pydantic-pkgr back as vendored lib becauase pypi is
 misbehaving

---
 .gitmodules                        |  3 +++
 archivebox/vendor/__init__.py      |  2 +-
 archivebox/vendor/requirements.txt |  3 ++-
 pyproject.toml                     |  2 +-
 requirements.txt                   |  8 +-------
 uv.lock                            | 16 ----------------
 6 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 011266be..db744b8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "archivebox/vendor/pocket"]
 	path = archivebox/vendor/pocket
 	url = https://github.com/tapanpandita/pocket
+[submodule "archivebox/vendor/pydantic-pkgr"]
+	path = archivebox/vendor/pydantic-pkgr
+	url = https://github.com/ArchiveBox/pydantic-pkgr
diff --git a/archivebox/vendor/__init__.py b/archivebox/vendor/__init__.py
index a3f276aa..a997acbb 100644
--- a/archivebox/vendor/__init__.py
+++ b/archivebox/vendor/__init__.py
@@ -8,7 +8,7 @@ VENDORED_LIBS = {
     # sys.path dir:         library name
     #'python-atomicwrites':  'atomicwrites',
     #'django-taggit':        'taggit',
-    #'pydantic-pkgr':        'pydantic_pkgr',
+    'pydantic-pkgr':        'pydantic_pkgr',
     'pocket':               'pocket',
     #'base32-crockford':     'base32_crockford',
 }
diff --git a/archivebox/vendor/requirements.txt b/archivebox/vendor/requirements.txt
index ee7fa139..43be87c2 100644
--- a/archivebox/vendor/requirements.txt
+++ b/archivebox/vendor/requirements.txt
@@ -2,6 +2,7 @@
 
 #atomicwrites==1.4.0
 #pocket==0.3.7
-#pocket@git+https://github.com/tapanpandita/pocket.git@v0.3.7
+pocket@git+https://github.com/tapanpandita/pocket.git@v0.3.7
 #django-taggit==1.3.0
 #base32-crockford==0.3.0
+pydantic-pkgr>=0.4.7
diff --git a/pyproject.toml b/pyproject.toml
index 57653346..599e796e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -78,7 +78,7 @@ dependencies = [
     "django-taggit==1.3.0",
     "base32-crockford==0.3.0",
     # "pocket@git+https://github.com/tapanpandita/pocket.git@v0.3.7",
-    "pydantic-pkgr>=0.4.6",
+    # "pydantic-pkgr>=0.4.7",
     ############# Plugin Dependencies ################
     "sonic-client>=1.0.0",
     "yt-dlp>=2024.8.6",               # for: media"
diff --git a/requirements.txt b/requirements.txt
index ebf78871..cc9b46bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -197,14 +197,9 @@ pydantic==2.9.2
     # via
     #   django-ninja
     #   django-pydantic-field
-    #   pydantic-pkgr
     #   pydantic-settings
 pydantic-core==2.23.4
-    # via
-    #   wpydantic
-    #   pydantic-pkgr
-pydantic-pkgr==0.4.6
-    # via archivebox (pyproject.toml)
+    # via pydantic
 pydantic-settings==2.5.2
     # via archivebox (pyproject.toml)
 pygments==2.18.0
@@ -306,7 +301,6 @@ typing-extensions==4.12.2
     #   django-stubs-ext
     #   pydantic
     #   pydantic-core
-    #   pydantic-pkgr
     #   twisted
 tzlocal==5.2
     # via dateparser
diff --git a/uv.lock b/uv.lock
index ce3e6fe0..ffb1c7ce 100644
--- a/uv.lock
+++ b/uv.lock
@@ -68,7 +68,6 @@ dependencies = [
     { name = "pluggy" },
     { name = "psutil" },
     { name = "py-machineid" },
-    { name = "pydantic-pkgr" },
     { name = "pydantic-settings" },
     { name = "python-benedict", extra = ["io", "parse"] },
     { name = "python-crontab" },
@@ -148,7 +147,6 @@ requires-dist = [
     { name = "pluggy", specifier = ">=1.5.0" },
     { name = "psutil", specifier = ">=6.0.0" },
     { name = "py-machineid", specifier = ">=0.6.0" },
-    { name = "pydantic-pkgr", specifier = ">=0.4.3" },
     { name = "pydantic-settings", specifier = ">=2.5.2" },
     { name = "python-benedict", extras = ["io", "parse"], specifier = ">=0.33.2" },
     { name = "python-crontab", specifier = ">=3.2.0" },
@@ -1799,20 +1797,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a9/f9/b6bcaf874f410564a78908739c80861a171788ef4d4f76f5009656672dfe/pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753", size = 1920344 },
 ]
 
-[[package]]
-name = "pydantic-pkgr"
-version = "0.4.4"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "pydantic" },
-    { name = "pydantic-core" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b6/8d/7b8a493ffa0ccf110e7f0441b9124ff363a769720b3b0d713adfbf765d23/pydantic_pkgr-0.4.4.tar.gz", hash = "sha256:b49964f6228b7ab232a00ec638534e38a8f04b892dc396b41a3e121c50248599", size = 37405 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/42/67/ed318b8bd9991762c64786fdf41e3c62dad427a688b4eeb2de9e35a6afab/pydantic_pkgr-0.4.4-py3-none-any.whl", hash = "sha256:f0b050543909cefb979a8ef238b6ba7010b7e05de9924c8a4ba20c567c6b1489", size = 39936 },
-]
-
 [[package]]
 name = "pydantic-settings"
 version = "2.5.2"