saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bump to twilio==8.2.2

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-06-02 12:12:16 +01:00 • committed by Pedro Algarvio
parent 0df47ecb62
commit 44cb892333
7 changed files with 52 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
requirements/static/ci/py3.10/linux.txt
View file

@ -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

11
requirements/static/ci/py3.11/linux.txt
View file

@ -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

11
requirements/static/ci/py3.8/linux.txt
View file

@ -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

11
requirements/static/ci/py3.9/linux.txt
View file

@ -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

2
salt/beacons/twilio_txt_msg.py
View file

@ -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

16
salt/modules/twilio_notify.py
View file

@ -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_)

12
salt/returners/sms_return.py
View file

@ -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: