From d87896da28e3aa23a96d908bd38a5c0e6ec1ef32 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Tue, 28 Jan 2025 12:47:14 +0100
Subject: [PATCH] gnu: python-requests-unixsocket: Update to 0.4.2.

* gnu/packages/python-web.scm (python-requests-unixsocket): Define as
deprecated alias for...
(python-requests-unixsocket2): ...this new variable.
[source]: Fetch from forked git repository.
[home-page]: Update.
[arguments]: Remove.
[native-inputs]: Remove python-apipkg, python-appdirs, python-execnet,
python-packaging, python-pep8, python-py, python-pyparsing,
python-pytest-cache, python-pytest-pep8, python-setuptools, python-six, and
python-wheel; add python-poetry-core.
[propagated-inputs]: Remove python-urllib3.
(python-cheroot)[native-inputs]: Replace python-requests-unixsocket with
python-requests-unixsocket2.
* gnu/packages/python-xyz.scm (python-notebook)[native-inputs]: Same.
* gnu/packages/jupyter.scm (python-nbclassic)[native-inputs]: Same.

Change-Id: I4c35ff9f86aa7e3df0f2b9ed8616727a7a94f12d
---
 gnu/packages/jupyter.scm    |  2 +-
 gnu/packages/python-web.scm | 55 ++++++++++---------------------------
 gnu/packages/python-xyz.scm |  2 +-
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index d4a9b9e82bb..56515a606f0 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -96,7 +96,7 @@
                          python-pytest-jupyter
                          python-pytest-tornasync
                          python-requests
-                         python-requests-unixsocket
+                         python-requests-unixsocket2
                          python-testpath))
     (home-page "https://github.com/jupyter/nbclassic")
     (synopsis "Jupyter Notebook as a Jupyter Server extension")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9aca72b863c..fe17dcfa523 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2052,7 +2052,7 @@ other HTTP libraries.")
            python-pytest-mock
            python-requests
            python-requests-toolbelt
-           python-requests-unixsocket
+           python-requests-unixsocket2
            python-setuptools
            python-setuptools-scm
            python-trustme
@@ -4644,58 +4644,33 @@ than Python’s urllib2 library.")
 python-requests.")
     (license license:isc)))
 
-(define-public python-requests-unixsocket
+(define-public python-requests-unixsocket2
   (package
-    (name "python-requests-unixsocket")
-    (version "0.2.0")
+    (name "python-requests-unixsocket2")
+    (version "0.4.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "requests-unixsocket" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/thelabnyc/requests-unixsocket2")
+             (commit (string-append "v" version))))
        (sha256
-        (base32 "1sn12y4fw1qki5gxy9wg45gmdrxhrndwfndfjxhpiky3mwh1lp4y"))))
+        (base32 "0vy0c1xwwmm6xqabhl2j7zqgsldvcs8ar547nk5r9l2yb7gngzjk"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; TypeError: HTTPConnection.request() got an unexpected keyword
-      ;; argument 'chunked'
-      #~(list "-k" (string-append "not test_unix_domain_adapter_ok"
-                                  " and not test_unix_domain_adapter_url_with_query_params"
-                                  " and not test_unix_domain_adapter_connection_error"
-                                  " and not test_unix_domain_adapter_monkeypatch"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'skip-pep8
-            (lambda _
-              (substitute* "pytest.ini"
-                (("--pep8") "")))))))
     (native-inputs
-     (list python-apipkg
-           python-appdirs
-           python-execnet
-           python-packaging
-           python-pep8
-           python-py
-           python-pyparsing
-           python-pytest
-           python-pytest-cache
-           python-pytest-pep8
-           python-setuptools
-           python-six
-           python-waitress
-           python-wheel))
+     (list python-poetry-core python-pytest python-waitress))
     (propagated-inputs
-     (list python-pbr
-           python-requests
-           python-urllib3))
-    (home-page "https://github.com/msabramo/requests-unixsocket")
+     (list python-pbr python-requests))
+    (home-page "https://gitlab.com/thelabnyc/requests-unixsocket2")
     (synopsis "Talk HTTP via a UNIX domain socket")
     (description
      "This Python package lets you use the @code{requests} library to talk
 HTTP via a UNIX domain socket.")
     (license license:asl2.0)))
 
+(define-public python-requests-unixsocket
+  (deprecated-package "python-requests-unixsocket" python-requests-unixsocket2))
+
 (define-public python-requests_ntlm
   (package
     (name "python-requests_ntlm")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4c48912c694..c937299d8a3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19461,7 +19461,7 @@ convert an @code{.ipynb} notebook file into various static formats including:
            python-pytest
            python-pytest-cov
            python-requests
-           python-requests-unixsocket
+           python-requests-unixsocket2
            python-setuptools
            python-wheel))
     (home-page "https://jupyter.org/")