From 44cb892333f43be7687e6963671a0cf638b80f99 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 2 Jun 2023 12:12:16 +0100 Subject: [PATCH] Bump to `twilio==8.2.2` Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.10/linux.txt | 11 ++++++++--- requirements/static/ci/py3.11/linux.txt | 11 ++++++++--- requirements/static/ci/py3.8/linux.txt | 11 ++++++++--- requirements/static/ci/py3.9/linux.txt | 11 ++++++++--- salt/beacons/twilio_txt_msg.py | 2 +- salt/modules/twilio_notify.py | 16 +++++++++++----- salt/returners/sms_return.py | 12 ++++++++---- 7 files changed, 52 insertions(+), 22 deletions(-) diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index c02fd38a8d0..97b64d54437 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -4,8 +4,13 @@ # # pip-compile --output-file=requirements/static/ci/py3.10/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -aiohttp==3.8.1 - # via etcd3-py +aiohttp-retry==2.8.3 + # via twilio +aiohttp==3.8.4 + # via + # aiohttp-retry + # etcd3-py + # twilio aiosignal==1.2.0 # via aiohttp ansible-core==2.15.0 @@ -566,7 +571,7 @@ ttp==0.9.4 # via # napalm # ttp-templates -twilio==7.9.2 +twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.12.10 # via responses diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 1fb30a1ae86..472fadee90d 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -4,8 +4,13 @@ # # pip-compile --output-file=requirements/static/ci/py3.11/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -aiohttp==3.8.1 - # via etcd3-py +aiohttp-retry==2.8.3 + # via twilio +aiohttp==3.8.4 + # via + # aiohttp-retry + # etcd3-py + # twilio aiosignal==1.2.0 # via aiohttp ansible-core==2.15.0 @@ -560,7 +565,7 @@ ttp==0.9.4 # via # napalm # ttp-templates -twilio==7.9.2 +twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.12.10 # via responses diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index cb01049c3d3..ca1e2af8ece 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -4,8 +4,13 @@ # # pip-compile --output-file=requirements/static/ci/py3.8/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -aiohttp==3.8.1 - # via etcd3-py +aiohttp-retry==2.8.3 + # via twilio +aiohttp==3.8.4 + # via + # aiohttp-retry + # etcd3-py + # twilio aiosignal==1.2.0 # via aiohttp ansible-core==2.11.12 @@ -570,7 +575,7 @@ ttp==0.9.4 # via # napalm # ttp-templates -twilio==7.9.2 +twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.12.10 # via responses diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 7b797844443..83a0309f440 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -4,8 +4,13 @@ # # pip-compile --output-file=requirements/static/ci/py3.9/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt # -aiohttp==3.8.1 - # via etcd3-py +aiohttp-retry==2.8.3 + # via twilio +aiohttp==3.8.4 + # via + # aiohttp-retry + # etcd3-py + # twilio aiosignal==1.2.0 # via aiohttp ansible-core==2.15.0 @@ -568,7 +573,7 @@ ttp==0.9.4 # via # napalm # ttp-templates -twilio==7.9.2 +twilio==8.2.2 # via -r requirements/static/ci/linux.in types-pyyaml==6.0.12.10 # via responses diff --git a/salt/beacons/twilio_txt_msg.py b/salt/beacons/twilio_txt_msg.py index 7ff5a361fb6..6aed64531dd 100644 --- a/salt/beacons/twilio_txt_msg.py +++ b/salt/beacons/twilio_txt_msg.py @@ -13,7 +13,7 @@ try: if twilio_version > (5,): from twilio.rest import Client as TwilioRestClient else: - from twilio.rest import TwilioRestClient + from twilio.rest import TwilioRestClient # pylint: disable=no-name-in-module HAS_TWILIO = True except ImportError: HAS_TWILIO = False diff --git a/salt/modules/twilio_notify.py b/salt/modules/twilio_notify.py index 99437716976..eb0b0721227 100644 --- a/salt/modules/twilio_notify.py +++ b/salt/modules/twilio_notify.py @@ -27,14 +27,20 @@ try: # Grab version, ensure elements are ints twilio_version = tuple(int(x) for x in twilio.__version_info__) - if twilio_version > (5,): - TWILIO_5 = False + TWILIO_LT_5 = False + if twilio_version > (6,): + from twilio.base.exceptions import TwilioRestException + from twilio.rest import Client as TwilioRestClient + elif twilio_version > (5,): + # pylint: disable=no-name-in-module from twilio.rest import Client as TwilioRestClient from twilio.rest import TwilioException as TwilioRestException + + # pylint: enable=no-name-in-module else: - TWILIO_5 = True + TWILIO_LT_5 = True from twilio import TwilioRestException # pylint: disable=no-name-in-module - from twilio.rest import TwilioRestClient + from twilio.rest import TwilioRestClient # pylint: disable=no-name-in-module HAS_LIBS = True except ImportError: pass @@ -84,7 +90,7 @@ def send_sms(profile, body, to, from_): ret["message"]["sid"] = None client = _get_twilio(profile) try: - if TWILIO_5: + if TWILIO_LT_5: message = client.sms.messages.create(body=body, to=to, from_=from_) else: message = client.messages.create(body=body, to=to, from_=from_) diff --git a/salt/returners/sms_return.py b/salt/returners/sms_return.py index 798477d7bea..3bb0eb03037 100644 --- a/salt/returners/sms_return.py +++ b/salt/returners/sms_return.py @@ -38,14 +38,18 @@ try: # Grab version, ensure elements are ints twilio_version = tuple(int(x) for x in twilio.__version_info__) - if twilio_version > (5,): - TWILIO_5 = False + if twilio_version > (6,): + from twilio.base.exceptions import TwilioRestException + from twilio.rest import Client as TwilioRestClient + elif twilio_version > (5,): + # pylint: disable=no-name-in-module from twilio.rest import Client as TwilioRestClient from twilio.rest import TwilioException as TwilioRestException + + # pylint: enable=no-name-in-module else: - TWILIO_5 = True from twilio import TwilioRestException # pylint: disable=no-name-in-module - from twilio.rest import TwilioRestClient + from twilio.rest import TwilioRestClient # pylint: disable=no-name-in-module HAS_TWILIO = True except ImportError: