Skip to content

[DEV-6444] Bumping urllib3 to v2.5.0, and pulling in zepben.auth via the SDK. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charlta merged 1 commit into from
Jan 9, 2026
Merged

[DEV-6444] Bumping urllib3 to v2.5.0, and pulling in zepben.auth via the SDK. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ docs/yarn-debug.log*
docs/yarn-error.log*
docs/versioned_docs/static/

.tox/
2 changes: 1 addition & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion src/zepben/eas/client/eas_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions test/test_eas_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down