Prep for the 3.3.0 release (#96)

docs/changelog.rst

@@ -1,10 +1,12 @@
 Changelog
 =========
 
-vNext
+3.3.0
 '''''
 
-- Adapt to the new ``httpx`` api to support versions >= 0.8.0 (thanks `Dave Hirschfeld <https://github.com/dhirschfeld>`_)
+- Adapt to the new ``httpx`` API to support
+  `versions >= 0.11.0 <https://github.com/encode/httpx/blob/master/CHANGELOG.md>`_
+  (thanks `Dave Hirschfeld <https://github.com/dhirschfeld>`_)
 
 3.2.0
 '''''

docs/conf.py

@@ -62,7 +62,10 @@
 # The short X.Y version.
 version = ''
 # The full version, including alpha/beta/rc tags.
-release = ''
+sys.path.insert(0, os.path.abspath('..'))
+import gidgethub
+release = gidgethub.__version__
+del sys.path[0]
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/httpx.rst

@@ -12,7 +12,7 @@
         import gidgethub.httpx
 
 
-        async with httpx.Client() as client:
+        async with httpx.AsyncClient() as client:
             gh = gidgethub.httpx.GitHubAPI(client, requester,
                                            oauth_token=oauth_token)
             # Make your requests, e.g. ...

gidgethub/__init__.py

@@ -1,5 +1,5 @@
 """An async GitHub API library"""
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 
 import http
 from typing import Any

gidgethub/httpx.py

@@ -1,16 +1,13 @@
 import asyncio
 from typing import Mapping, Tuple, Any
 
-try:
-    from httpx import AsyncClient as Client
-except ImportError:
-    from httpx import Client
+import httpx
 
 from . import abc as gh_abc
 
 
 class GitHubAPI(gh_abc.GitHubAPI):
-    def __init__(self, client: Client, *args: Any,
+    def __init__(self, client: httpx.AsyncClient, *args: Any,
                  **kwargs: Any) -> None:
         self._client = client
         super().__init__(*args, **kwargs)

gidgethub/test/test_httpx.py

@@ -1,9 +1,6 @@
 import datetime
 
-try:
-    from httpx import AsyncClient as Client  # type: ignore
-except ImportError:
-    from httpx import Client
+import httpx
 
 import pytest
 
@@ -15,7 +12,7 @@
 async def test_sleep():
     delay = 1
     start = datetime.datetime.now()
-    async with Client() as client:
+    async with httpx.AsyncClient() as client:
         gh = gh_httpx.GitHubAPI(client, "gidgethub")
         await gh.sleep(delay)
     stop = datetime.datetime.now()
@@ -26,7 +23,7 @@ async def test_sleep():
 async def test__request():
     """Make sure that that abstract method is implemented properly."""
     request_headers = sansio.create_headers("gidgethub")
-    async with Client() as client:
+    async with httpx.AsyncClient() as client:
         gh = gh_httpx.GitHubAPI(client, "gidgethub")
         aio_call = await gh._request("GET", "https://api.github.com/rate_limit",
                                      request_headers)
@@ -37,7 +34,7 @@ async def test__request():
 @pytest.mark.asyncio
 async def test_get():
     """Integration test."""
-    async with Client() as client:
+    async with httpx.AsyncClient() as client:
         gh = gh_httpx.GitHubAPI(client, "gidgethub")
         data = await gh.getitem("/rate_limit")
     assert "rate" in data

pyproject.toml

@@ -29,7 +29,7 @@ dev = ["aiohttp", "httpx", "mypy", "pytest-cov", "treq", "twisted[tls]", "tornad
 aiohttp = ["aiohttp"]
 treq = ["treq", "twisted[tls]"]
 tornado = ["tornado"]
-httpx = ["httpx"]
+httpx = ["httpx>=0.11.0"]
 
 [tool.flit.metadata.urls]
 Documentation = "https://gidgethub.readthedocs.io"