Change httpx to requests

Author: jdavid

pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
     "platformdirs",
     "numexpr; platform_machine != 'wasm32'",
     "py-cpuinfo; platform_machine != 'wasm32'",
-    "httpx; platform_machine != 'wasm32'",
+    "requests",
 ]
 version = "3.1.2.dev0"
 

src/blosc2/c2array.py

@@ -16,12 +16,10 @@
     from collections.abc import Sequence
 
 import numpy as np
+import requests
 
 import blosc2
 
-if not blosc2.IS_WASM:
-    import httpx
-
 _subscriber_data = {
     "urlbase": os.environ.get("BLOSC_C2URLBASE"),
     "auth_token": "",
@@ -110,15 +108,15 @@ def _xget(url, params=None, headers=None, auth_token=None, timeout=TIMEOUT):
     if auth_token:
         headers = headers.copy() if headers else {}
         headers["Cookie"] = auth_token
-    response = httpx.get(url, params=params, headers=headers, timeout=timeout)
+    response = requests.get(url, params=params, headers=headers, timeout=timeout)
     response.raise_for_status()
     return response
 
 
 def _xpost(url, json=None, auth_token=None, timeout=TIMEOUT):
     auth_token = auth_token or _subscriber_data["auth_token"]
     headers = {"Cookie": auth_token} if auth_token else None
-    response = httpx.post(url, json=json, headers=headers, timeout=timeout)
+    response = requests.post(url, json=json, headers=headers, timeout=timeout)
     response.raise_for_status()
     return response.json()
 
@@ -133,7 +131,7 @@ def _sub_url(urlbase, path):
 def login(username, password, urlbase):
     url = _sub_url(urlbase, "auth/jwt/login")
     creds = {"username": username, "password": password}
-    resp = httpx.post(url, data=creds, timeout=TIMEOUT)
+    resp = requests.post(url, data=creds, timeout=TIMEOUT)
     resp.raise_for_status()
     return "=".join(list(resp.cookies.items())[0])
 
@@ -229,14 +227,14 @@ def __init__(self, path: str, /, urlbase: str | None = None, auth_token: str | N
         # Try to 'open' the remote path
         try:
             self.meta = info(self.path, self.urlbase, auth_token=self.auth_token)
-        except httpx.HTTPStatusError:
+        except requests.HTTPError:
             # Subscribe to root and try again. It is less latency to subscribe directly
             # than to check for the subscription.
             root, _ = self.path.split("/", 1)
             subscribe(root, self.urlbase, self.auth_token)
             try:
                 self.meta = info(self.path, self.urlbase, auth_token=self.auth_token)
-            except httpx.HTTPStatusError as err:
+            except requests.HTTPError as err:
                 raise FileNotFoundError(f"Remote path not found: {path}.\nError was: {err}") from err
         cparams = self.meta["schunk"]["cparams"]
         # Remove "filters, meta" from cparams; this is an artifact from the server

tests/conftest.py

@@ -32,9 +32,9 @@ def c2sub_context():
 # def pytest_runtest_call(item):
 #     try:
 #         item.runtest()
-#     except httpx.ConnectTimeout:
-#         pytest.skip("Skipping test due to sporadic httpx.ConnectTimeout")
-#     except httpx.ReadTimeout:
-#         pytest.skip("Skipping test due to sporadic httpx.ReadTimeout")
-#     except httpx.TimeoutException:
-#         pytest.skip("Skipping test due to sporadic httpx.Timeout")
+#     except requests.ConnectTimeout:
+#         pytest.skip("Skipping test due to sporadic requests.ConnectTimeout")
+#     except requests.ReadTimeout:
+#         pytest.skip("Skipping test due to sporadic requests.ReadTimeout")
+#     except requests.Timeout:
+#         pytest.skip("Skipping test due to sporadic requests.Timeout")

tests/test_open_c2array.py

@@ -9,9 +9,9 @@
 import pathlib
 import random
 
-import httpx
 import numpy as np
 import pytest
+import requests
 
 import blosc2
 
@@ -69,7 +69,7 @@ def rand32():
     password = hex(rand32())
 
     for _ in range(3):
-        resp = httpx.post(
+        resp = requests.post(
             f"{urlbase}auth/register", json={"email": username, "password": password}, timeout=15
         )
         if resp.status_code != 400: