diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d5a3b072..b0797b01 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,16 +30,16 @@ jobs: run: ulimit -a - name: Build docker - run: docker-compose -f docker/docker-compose.yml build --build-arg BASE_IMG=python:${{ matrix.python-version }} --no-cache + run: docker compose -f docker/docker-compose.yml build --build-arg BASE_IMG=python:${{ matrix.python-version }} --no-cache - name: Run unit tests - run: docker-compose -f docker/docker-compose.yml run --rm unit-test + run: docker compose -f docker/docker-compose.yml run --rm unit-test - name: Run integration tests - run: docker-compose -f docker/docker-compose.yml run --rm integration-test + run: docker compose -f docker/docker-compose.yml run --rm integration-test - name: Generate coverage html report with dynamic contexts - run: docker-compose -f docker/docker-compose.yml run --rm coverage + run: docker compose -f docker/docker-compose.yml run --rm coverage - uses: actions/upload-artifact@v3 with: diff --git a/fauna/client/client.py b/fauna/client/client.py index fa90df3e..9d8d233f 100644 --- a/fauna/client/client.py +++ b/fauna/client/client.py @@ -180,8 +180,8 @@ def __init__( from fauna.http.httpx_client import HTTPXClient c = HTTPXClient( httpx.Client( - http1=False, - http2=True, + http1=True, + http2=False, timeout=httpx.Timeout( timeout=timeout_s, connect=connect_timeout_s, diff --git a/fauna/http/httpx_client.py b/fauna/http/httpx_client.py index 22bc7ddf..c317d7fa 100644 --- a/fauna/http/httpx_client.py +++ b/fauna/http/httpx_client.py @@ -73,26 +73,12 @@ def request( raise ClientError("Invalid URL Format") from e try: - return HTTPXResponse(self._send_with_retry(3, request)) - except (httpx.HTTPError, httpx.InvalidURL) as e: - raise NetworkError("Exception re-raised from HTTP request") from e - - def _send_with_retry( - self, - retryCount: int, - request: httpx.Request, - ) -> httpx.Response: - try: - response = self._c.send( + return HTTPXResponse(self._c.send( request, stream=False, - ) - return response - except httpx.TransportError as e: - if retryCount == 0: - raise e - else: - return self._send_with_retry(retryCount - 1, request) + )) + except (httpx.HTTPError, httpx.InvalidURL) as e: + raise NetworkError("Exception re-raised from HTTP request") from e @contextmanager def stream(