Skip to content
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

Bump influxdb-client dependency to 1.24.0 #63397

Merged
merged 3 commits into from
Jan 5, 2022
Merged

Bump influxdb-client dependency to 1.24.0 #63397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63633ee
Bump influxdb-client dependency to 1.24.0
mdegat01 Jan 4, 2022
3f1c623
Fix manifest and timeout
mdegat01 Jan 4, 2022
7a83800
Pass mock of http response to stop NPE
mdegat01 Jan 5, 2022
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 homeassistant/components/influxdb/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ def get_influx_connection(conf, test_write=False, test_read=False): # noqa: C90
precision = conf.get(CONF_PRECISION)

if conf[CONF_API_VERSION] == API_VERSION_2:
kwargs[CONF_TIMEOUT] = TIMEOUT * 1000
kwargs[CONF_URL] = conf[CONF_URL]
kwargs[CONF_TOKEN] = conf[CONF_TOKEN]
kwargs[INFLUX_CONF_ORG] = conf[CONF_ORG]
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/influxdb/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"domain": "influxdb",
"name": "InfluxDB",
"documentation": "https://www.home-assistant.io/integrations/influxdb",
"requirements": ["influxdb==5.3.1", "influxdb-client==1.14.0"],
"requirements": ["influxdb==5.3.1", "influxdb-client==1.24.0"],
"codeowners": ["@fabaff", "@mdegat01"],
"iot_class": "local_push"
}
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ ihcsdk==2.7.0
incomfort-client==0.4.4

# homeassistant.components.influxdb
influxdb-client==1.14.0
influxdb-client==1.24.0

# homeassistant.components.influxdb
influxdb==5.3.1
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ icmplib==3.0
ifaddr==0.1.7

# homeassistant.components.influxdb
influxdb-client==1.14.0
influxdb-client==1.24.0

# homeassistant.components.influxdb
influxdb==5.3.1
Expand Down
4 changes: 2 additions & 2 deletions tests/components/influxdb/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@ async def test_event_listener_attribute_name_conflict(
BASE_V2_CONFIG,
_get_write_api_mock_v2,
influxdb.API_VERSION_2,
influxdb.ApiException(),
influxdb.ApiException(http_resp=MagicMock()),
),
],
indirect=["mock_client", "get_mock_call"],
Expand Down Expand Up @@ -1650,7 +1650,7 @@ async def test_connection_failure_on_startup(
BASE_V2_CONFIG,
_get_write_api_mock_v2,
influxdb.API_VERSION_2,
influxdb.ApiException(status=HTTPStatus.BAD_REQUEST),
influxdb.ApiException(status=HTTPStatus.BAD_REQUEST, http_resp=MagicMock()),
),
],
indirect=["mock_client", "get_mock_call"],
Expand Down
6 changes: 3 additions & 3 deletions tests/components/influxdb/test_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,14 +417,14 @@ async def test_state_for_no_results(
BASE_V2_CONFIG,
BASE_V2_QUERY,
_set_query_mock_v2,
ApiException(),
ApiException(http_resp=MagicMock()),
),
(
API_VERSION_2,
BASE_V2_CONFIG,
BASE_V2_QUERY,
_set_query_mock_v2,
ApiException(status=HTTPStatus.BAD_REQUEST),
ApiException(status=HTTPStatus.BAD_REQUEST, http_resp=MagicMock()),
),
],
indirect=["mock_client"],
Expand Down Expand Up @@ -534,7 +534,7 @@ async def test_error_rendering_template(
BASE_V2_CONFIG,
BASE_V2_QUERY,
_set_query_mock_v2,
ApiException(),
ApiException(http_resp=MagicMock()),
_make_v2_resultset,
),
],
Expand Down