Merge pull request #156 from synccomputingcode/shughes/fix-httpx-compat

Fix compatiblity with httpx

Author: shughes-uk

sync/__init__.py

@@ -1,5 +1,5 @@
 """Library for leveraging the power of Sync"""
 
-__version__ = "1.11.6"
+__version__ = "1.11.7"
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"

sync/clients/databricks.py

@@ -3,6 +3,7 @@
 from typing import Generator, Union
 
 import httpx
+from packaging.version import Version
 
 from sync.config import DB_CONFIG
 from sync.models import Platform
@@ -24,12 +25,17 @@ def auth_flow(self, request: httpx.Request) -> Generator[httpx.Request, httpx.Re
 
 class DatabricksClient(RetryableHTTPClient):
     def __init__(self, base_url: str, access_token: str):
+        kwargs = {}
+        if Version(httpx.__version__) < Version("0.26.0"):
+            kwargs["proxies"] = os.getenv("FIXIE_URL")
+        else:
+            kwargs["proxy"] = os.getenv("FIXIE_URL")
         super().__init__(
             client=httpx.Client(
                 base_url=base_url,
                 headers={"User-Agent": DATABRICKS_USER_AGENT},
                 auth=DatabricksAuth(access_token),
-                proxies=os.getenv("FIXIE_URL"),
+                **kwargs,
             )
         )