From 239cfca534994692b97665845b906e18d8372860 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 08:24:02 -0400
Subject: [PATCH 1/6] Use socks support from the operating system

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 52f20479..47892191 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -276,6 +276,7 @@ RUN --mount=type=cache,id=apt-lib-cache,sharing=locked,target=/var/lib/apt \
   pkgconf \
   python3 \
   python3-libsass \
+  python3-python-socks \
   python3-wheel \
   curl \
   less \

From 7db0048f80e8869d25764b031ff430420b91a0e3 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 08:25:57 -0400
Subject: [PATCH 2/6] Remove requests[socks] from Pipfile

---
 Pipfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index 9f8adf33..a6bc52d8 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,5 +19,4 @@ django-basicauth = "*"
 psycopg2-binary = "*"
 mysqlclient = "*"
 yt-dlp = "*"
-requests = {extras = ["socks"], version = "*"}
 emoji = "*"

From 092e5ef54cb78c28834ee39fe35dd1f99ca194da Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 08:38:25 -0400
Subject: [PATCH 3/6] Add `python3-socks`

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 47892191..9f579b58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -277,6 +277,7 @@ RUN --mount=type=cache,id=apt-lib-cache,sharing=locked,target=/var/lib/apt \
   python3 \
   python3-libsass \
   python3-python-socks \
+  python3-socks \
   python3-wheel \
   curl \
   less \

From 2cd33672afa59939c59f4cebcef80a533fe40966 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:05:38 -0400
Subject: [PATCH 4/6] Remove `python3-python-socks`

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9f579b58..43aebe28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -276,7 +276,6 @@ RUN --mount=type=cache,id=apt-lib-cache,sharing=locked,target=/var/lib/apt \
   pkgconf \
   python3 \
   python3-libsass \
-  python3-python-socks \
   python3-socks \
   python3-wheel \
   curl \

From aa54a88cdb1ae9cfe35d779378e6ce2a9e9668f5 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:25:57 -0400
Subject: [PATCH 5/6] Add `urllib3[socks]` and `requests[socks]`

These each have slightly different version requirements for `PySocks`.
---
 Pipfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Pipfile b/Pipfile
index a6bc52d8..0080822f 100644
--- a/Pipfile
+++ b/Pipfile
@@ -18,5 +18,7 @@ django-background-tasks = ">=1.2.8"
 django-basicauth = "*"
 psycopg2-binary = "*"
 mysqlclient = "*"
+urllib3 = {extras = ["socks"], version = "*"}
+requests = {extras = ["socks"], version = "*"}
 yt-dlp = "*"
 emoji = "*"

From f0f7edfd479827e081960fe0426486b06fe9c688 Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:28:26 -0400
Subject: [PATCH 6/6] Add `PySocks`

Upgrade to the latest, if the OS version is too old.
---
 Pipfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Pipfile b/Pipfile
index 0080822f..907755b7 100644
--- a/Pipfile
+++ b/Pipfile
@@ -18,6 +18,7 @@ django-background-tasks = ">=1.2.8"
 django-basicauth = "*"
 psycopg2-binary = "*"
 mysqlclient = "*"
+PySocks = "*"
 urllib3 = {extras = ["socks"], version = "*"}
 requests = {extras = ["socks"], version = "*"}
 yt-dlp = "*"