Use httpx instead of requests

Author: goodmami

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Maintenance
 
 * Removed `requirements.txt`; it was unnecessary and out of date
+* Replaced `requests` dependency with `httpx`
 
 
 ## [v1.10.0]

CONTRIBUTING.md

@@ -19,7 +19,7 @@ Questions about PyDelphin can be asked on the [DELPH-IN Discourse
 site](https://delphinqa.ling.washington.edu/) in the "PyDelphin Tools"
 category.
 
-For bug requests, please provide the following, if possible:
+For bug reports, please provide the following, if possible:
 
 * a minimal working example
 * version of PyDelphin (and relevant dependencies)

delphin/web/client.py

@@ -5,7 +5,7 @@
 
 from urllib.parse import urljoin
 
-import requests
+import httpx
 
 from delphin import interface
 
@@ -60,7 +60,7 @@ def interact(self, datum, params=None, headers=None):
             A Response containing the results, if the request was
             successful.
         Raises:
-            requests.HTTPError: if the status code was not 200
+            httpx.HTTPError: if the status code was not 200
         """
         if params is None:
             params = {}
@@ -71,11 +71,10 @@ def interact(self, datum, params=None, headers=None):
             hdrs.update(headers)
 
         url = urljoin(self.server, self.task)
-        r = requests.get(url, params=params, headers=hdrs)
-        if r.status_code == 200:
-            return _HTTPResponse(r.json())
-        else:
-            r.raise_for_status()
+        with httpx.Client() as client:
+            r = client.get(url, params=params, headers=hdrs)
+        r.raise_for_status()
+        return _HTTPResponse(r.json())
 
     def process_item(self, datum, keys=None, params=None, headers=None):
         """
@@ -132,7 +131,7 @@ def parse(input, server=DEFAULT_SERVER, params=None, headers=None):
         A Response containing the results, if the request was
         successful.
     Raises:
-        requests.HTTPError: if the status code was not 200
+        httpx.HTTPError: if the status code was not 200
     """
     return next(parse_from_iterable([input], server, params, headers), None)
 
@@ -154,7 +153,7 @@ def parse_from_iterable(
     Yields:
         Response objects for each successful response.
     Raises:
-        requests.HTTPError: for the first response with a status code
+        httpx.HTTPError: for the first response with a status code
             that is not 200
     """
     client = Parser(server)
@@ -176,7 +175,7 @@ def generate(input, server=DEFAULT_SERVER, params=None, headers=None):
         A Response containing the results, if the request was
         successful.
     Raises:
-        requests.HTTPError: if the status code was not 200
+        httpx.HTTPError: if the status code was not 200
     """
     return next(generate_from_iterable([input], server, params, headers), None)
 
@@ -198,7 +197,7 @@ def generate_from_iterable(
     Yields:
         Response objects for each successful response.
     Raises:
-        requests.HTTPError: for the first response with a status code
+        httpx.HTTPError: for the first response with a status code
             that is not 200
     """
     client = Generator(server)

delphin/web/server.py

@@ -37,7 +37,7 @@ def configure(api, parser=None, generator=None, testsuites=None):
     :class:`GenerationServer` instances directly.
 
     Args:
-        api: an instance of :class:`falcon.API`
+        api: an instance of :class:`falcon.App`
         parser: a path to a grammar or a :class:`ParseServer` instance
         generator: a path to a grammar or a :class:`GenerationServer`
             instance

docs/api/delphin.web.client.rst

@@ -11,7 +11,7 @@ servers that implement the DELPH-IN Web API described here:
 
 .. note::
 
-   Requires `requests` (https://pypi.python.org/pypi/requests). This
+   Requires `httpx` (https://www.python-httpx.org/). This
    dependency is satisfied if you install PyDelphin with the ``[web]``
    extra (see :doc:`../guides/setup`).
 

docs/api/delphin.web.server.rst

@@ -29,7 +29,7 @@ such as the following example:
 
    from delphin.web import server
 
-   application = falcon.API()
+   application = falcon.App()
 
    server.configure(
        application,

docs/conf.py

@@ -187,7 +187,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'requests': ('https://requests.readthedocs.io/en/master/', None),
+    # 'httpx': ('https://www.python-httpx.org/', None),
     'falcon': ('https://falcon.readthedocs.io/en/2.0.0/', None)
 }
 

docs/guides/setup.rst

@@ -28,7 +28,7 @@ Module or Function                 Dependencies  Notes
 =================================  ============  ===========================
 :mod:`delphin.ace`                 ACE_          Linux and Mac only
 :mod:`delphin.highlight`           Pygments_
-:mod:`delphin.web.client`          requests_     ``[web]`` extra
+:mod:`delphin.web.client`          httpx_        ``[web]`` extra
 :mod:`delphin.web.server`          Falcon_       ``[web]`` extra
 :mod:`delphin.codecs.dmrspenman`   Penman_
 :mod:`delphin.codecs.edspenman`    Penman_
@@ -41,7 +41,7 @@ are not listed in the table above).
 
 .. _ACE: http://sweaglesw.org/linguistics/ace/
 .. _Pygments: https://pygments.org/
-.. _requests: http://python-requests.org/
+.. _httpx: https://www.python-httpx.org/
 .. _Falcon: https://falcon.readthedocs.io/
 .. _Penman: https://github.com/goodmami/penman
 .. _regex: https://bitbucket.org/mrabarnett/mrab-regex/

docs/requirements.txt

@@ -1,4 +1,4 @@
 sphinx
 sphinx-rtd-theme
-requests
+httpx
 falcon

pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
 [project.optional-dependencies]
 web = [
   "falcon",
-  "requests",
+  "httpx",
 ]
 repp = [
   "regex"
@@ -69,7 +69,6 @@ dependencies = [
   "pytest",
   "ruff",
   "mypy",
-  "types-requests",
 ]
 [tool.hatch.envs.dev.scripts]
 test = "pytest {args:.}"
@@ -80,7 +79,7 @@ typecheck = "mypy --namespace-packages --explicit-package-bases --ignore-missing
 dependencies = [
   "sphinx",
   "sphinx-rtd-theme",
-  "requests",
+  "httpx",
   "falcon",
 ]
 [tool.hatch.envs.docs.scripts]