diff --git a/.gitignore b/.gitignore index ce377d1..068bc72 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ docs/yarn-debug.log* docs/yarn-error.log* docs/versioned_docs/static/ +.tox/ diff --git a/changelog.md b/changelog.md index cd43eb4..5c9eb5f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ # EAS Python client ## [0.27.0] - UNRELEASED ### Breaking Changes -* None. +* Bumping `urllib3` to `v2.5.0`, and pulling in `zepben.auth` via the SDK. ### New Features * None. diff --git a/pyproject.toml b/pyproject.toml index ad4c380..a2fd639 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,8 @@ authors = [ dependencies = [ "geojson==2.5.0", "requests<3.0.0,>=2.26.0", - "urllib3==1.26.6", - "zepben.auth==0.12.1", + "urllib3==2.5.0", + "zepben.ewb==1.1.0b14", "aiohttp[speedups]==3.9.0", ] classifiers = [ diff --git a/src/zepben/eas/client/eas_client.py b/src/zepben/eas/client/eas_client.py index c2502d1..1cb5034 100644 --- a/src/zepben/eas/client/eas_client.py +++ b/src/zepben/eas/client/eas_client.py @@ -16,7 +16,7 @@ import aiohttp from aiohttp import ClientSession from urllib3.exceptions import InsecureRequestWarning -from zepben.auth import AuthMethod, ZepbenTokenFetcher, create_token_fetcher, create_token_fetcher_managed_identity +from zepben.ewb.auth import AuthMethod, ZepbenTokenFetcher, create_token_fetcher, create_token_fetcher_managed_identity from zepben.eas.client.feeder_load_analysis_input import FeederLoadAnalysisInput from zepben.eas.client.ingestor import IngestorConfigInput, IngestorRunsFilterInput, IngestorRunsSortCriteriaInput diff --git a/test/test_eas_client.py b/test/test_eas_client.py index 4d1e365..83bc6f8 100644 --- a/test/test_eas_client.py +++ b/test/test_eas_client.py @@ -15,7 +15,7 @@ import trustme from pytest_httpserver import HTTPServer from werkzeug import Response -from zepben.auth import ZepbenTokenFetcher +from zepben.ewb.auth import ZepbenTokenFetcher from zepben.eas import EasClient, Study, SolveConfig from zepben.eas import FeederConfig, ForecastConfig, FixedTimeLoadOverride @@ -99,7 +99,7 @@ def test_get_request_headers_adds_access_token_in_auth_header(): assert headers["authorization"] == f"Bearer {mock_access_token}" -@mock.patch("zepben.auth.client.zepben_token_fetcher.ZepbenTokenFetcher.fetch_token", return_value="test_token3") +@mock.patch("zepben.ewb.auth.client.zepben_token_fetcher.ZepbenTokenFetcher.fetch_token", return_value="test_token3") def test_get_request_headers_adds_token_from_token_fetcher_in_auth_header(_): eas_client = EasClient( mock_host, @@ -113,7 +113,7 @@ def test_get_request_headers_adds_token_from_token_fetcher_in_auth_header(_): assert headers["authorization"] == "test_token3" -@mock.patch("zepben.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( +@mock.patch("zepben.ewb.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( {"authType": "AUTH0", "audience": mock_audience, "issuer": "test_issuer"}, 200)) def test_create_eas_client_with_password_success(_): eas_client = EasClient( @@ -136,7 +136,7 @@ def test_create_eas_client_with_password_success(_): assert eas_client._verify_certificate == mock_verify_certificate -@mock.patch("zepben.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( +@mock.patch("zepben.ewb.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( {"authType": "AUTH0", "audience": mock_audience, "issuer": "test_issuer"}, 200)) def test_create_eas_client_with_client_secret_success(_): eas_client = EasClient( @@ -521,7 +521,7 @@ def test_raises_error_if_token_fetcher_and_creds_configured(httpserver: HTTPServ ) -@mock.patch("zepben.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( +@mock.patch("zepben.ewb.auth.client.zepben_token_fetcher.requests.get", side_effect=lambda *args, **kwargs: MockResponse( {"authType": "AUTH0", "audience": mock_audience, "issuer": "test_issuer"}, 200)) def test_allows_secret_and_creds_configured(httpserver: HTTPServer): eas_client = EasClient(