Move back to request

.github/workflows/tests.yml

@@ -47,5 +47,6 @@ jobs:
         python -m pip install -e . --no-deps --force-reinstall
 
     - name: Full Tests
-      run: |
-        python -m pytest -rxs --cov=erddapy tests
+      run: >
+        pushd tests && python download_test_data.py && popd
+        && python -m pytest -rxs --cov=erddapy tests

erddapy/core/url.py

@@ -13,8 +13,8 @@
 from typing import BinaryIO
 from urllib import parse
 
-import httpx
 import pytz
+import requests
 from pandas import to_datetime
 
 OptionalStr = str | None
@@ -68,19 +68,19 @@ def _clean_response(response: str) -> str:
 
 @functools.lru_cache(maxsize=128)
 def _urlopen(url: str, auth: tuple | None = None, **kwargs: dict) -> BinaryIO:
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = 60
-    response = httpx.get(
+    timeout = kwargs.pop("timeout", 60)
+    response = requests.get(
         url,
-        follow_redirects=True,
+        allow_redirects=True,
         auth=auth,
+        timeout=timeout,
         **kwargs,
     )
     try:
         response.raise_for_status()
-    except httpx.HTTPError as err:
+    except requests.HTTPError as err:
         msg = str(response.content.decode())
-        raise httpx.HTTPError(msg) from err
+        raise requests.HTTPError(msg) from err
     return io.BytesIO(response.content)
 
 
@@ -90,9 +90,9 @@ def urlopen(
     quote: bool = True,
     requests_kwargs: dict | None = None,
 ) -> BinaryIO:
-    """Thin wrapper around httpx get content.
+    """Thin wrapper around requests get content.
 
-    See httpx.get docs for the `params` and `kwargs` options.
+    See requests.get docs for the `params` and `kwargs` options.
 
     """
     # This is a horrible hack to work around opendap.co-ops.nos.noaa.gov.
@@ -123,7 +123,8 @@ def check_url_response(url: str, **kwargs: dict) -> str:
     necessary. Otherwise let it fail later and avoid fetching the head.
 
     """
-    r = httpx.head(url, **kwargs)
+    timeout = kwargs.pop("timeout", 10)
+    r = requests.head(url, timeout=timeout, **kwargs)
     r.raise_for_status()
     return url
 
@@ -159,8 +160,8 @@ def _format_search_string(server: str, query: str) -> str:
 def _multi_urlopen(url: str) -> BinaryIO:
     """Simpler url open to work with multiprocessing."""
     try:
-        data = urlopen(url)
-    except (httpx.HTTPError, httpx.ConnectError):
+        data = urlopen(url, requests_kwargs={"timeout": 120})
+    except (requests.HTTPError, requests.ConnectionError):
         return None
     return data
 

erddapy/erddapy.py

@@ -69,7 +69,7 @@ class ERDDAP:
         variables: a list variables to download.
         response: default is HTML.
         constraints: download constraints, default None (opendap-like url)
-        params and requests_kwargs: `httpx.get` options
+        params and requests_kwargs: `requests.get` options
 
     Returns:
     -------

erddapy/servers/servers.py

@@ -5,8 +5,8 @@
 from pathlib import Path
 from typing import NamedTuple
 
-import httpx
 import pandas as pd
+import requests
 
 
 class Server(NamedTuple):
@@ -26,9 +26,9 @@ def servers_list() -> dict:
     """
     try:
         url = "https://raw.githubusercontent.com/IrishMarineInstitute/awesome-erddap/master/erddaps.json"
-        r = httpx.get(url, timeout=10)
+        r = requests.get(url, timeout=10)
         df_servers = pd.read_json(io.StringIO(r.text))
-    except httpx.HTTPError:
+    except requests.HTTPError:
         path = Path(__file__).absolute().parent
         df_servers = pd.read_json(path.joinpath("erddaps.json"))
     # Drop non-public servers.

requirements.txt

@@ -1,3 +1,3 @@
-httpx>=0.25.0
 pandas>=0.25.2,<4
 pytz
+requests