Skip to content

Commit 6d19a3c

Browse files
cmlcciecmlccie
committed
Merge branch 'master' into pr/74
2 parents d074e9d + 11f2d4a commit 6d19a3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+386
-217
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
3+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Pipfile.lock

Lines changed: 183 additions & 114 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Contribution
154154
webexteamssdk_ is a community development projects. Feedback, thoughts, ideas, and code contributions are welcome! Please see the `Contributing`_ guide for more information.
155155

156156

157-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
157+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
158158

159159

160160
.. _ciscosparkapi: https://github.com/CiscoDevNet/ciscosparkapi/tree/ciscosparkapi

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
project = u'webexteamssdk'
14-
copyright = u'Copyright (c) 2016-2018 Cisco and/or its affiliates.'
14+
copyright = u'Copyright (c) 2016-2019 Cisco and/or its affiliates.'
1515
author = u'Chris Lunsford'
1616
version = get_versions()['version']
1717
release = get_versions()['version']

‎docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Webex Teams for Developers
6565
Leveraging the Webex Teams APIs and developing on top of the Webex Teams cloud is easy. Signup for a `free account`_ and then head over to the `Webex Teams for Developers`_ website to learn more.
6666

6767

68-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
68+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
6969

7070

7171
.. _free account: `Webex Teams`

‎docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ command:
5858
$ python setup.py install
5959
6060
61-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
61+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
6262

6363

6464
.. _Python Package Index (PyPI): https://pypi.python.org/pypi/webexteamssdk

‎docs/user/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,4 +278,4 @@ Warnings
278278
:members:
279279

280280

281-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
281+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*

‎docs/user/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ webexteamssdk License
151151
.. include:: ../../LICENSE
152152

153153

154-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
154+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
155155

156156

157157
.. _MIT Open Source License: https://opensource.org/licenses/MIT

‎docs/user/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ contain all of the returned objects.
443443
>>> rooms_list = list(rooms_iterable)
444444
445445
446-
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
446+
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
447447

448448

449449
.. _Webex Teams: https://www.webex.com/products/teams/index.html

‎examples/bot-example-flask.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
2323
This script supports Python versions 2 and 3.
2424
25-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
2626
2727
Permission is hereby granted, free of charge, to any person obtaining a copy
2828
of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,7 @@
5757
__author__ = "Chris Lunsford"
5858
__author_email__ = "chrlunsf@cisco.com"
5959
__contributors__ = ["Brad Bester <brbester@cisco.com>"]
60-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
60+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
6161
__license__ = "MIT"
6262

6363

‎examples/bot-example-webpy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
the time of this writing web.py (v0.38) only supports Python 2.
2323
Therefore this script only supports Python 2.
2424
25-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
2626
2727
Permission is hereby granted, free of charge, to any person obtaining a copy
2828
of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,7 @@
5757
__author__ = "Brad Bester"
5858
__author_email__ = "brbester@cisco.com"
5959
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
60-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
60+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
6161
__license__ = "MIT"
6262

6363

‎examples/local_file_upload.py

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
"""Demo script showing how to upload a local file.
4+
5+
A simple script showing how to upload a local file when creating a message in
6+
a Webex Teams space.
7+
8+
You upload a file by using the `files=` parameter of the
9+
`WebexTeamsAPI.messages.create()` method, which expects to receive a list
10+
containing a single string with the path to file to be attached to the created
11+
message (Example: `files=["./image.png"]`). The files parameter receives a
12+
list to allow for future expansion; however today, only one file may be
13+
included when creating a message via the Webex Teams APIs.
14+
15+
The WebexTeamsSDK natively retrieves your Webex Teams access token from the
16+
WEBEX_TEAMS_ACCESS_TOKEN environment variable. You must have this environment
17+
variable set to run this script.
18+
19+
20+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
21+
22+
Permission is hereby granted, free of charge, to any person obtaining a copy
23+
of this software and associated documentation files (the "Software"), to deal
24+
in the Software without restriction, including without limitation the rights
25+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
26+
copies of the Software, and to permit persons to whom the Software is
27+
furnished to do so, subject to the following conditions:
28+
29+
The above copyright notice and this permission notice shall be included in all
30+
copies or substantial portions of the Software.
31+
32+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
33+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
34+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
35+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
36+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
37+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
38+
SOFTWARE.
39+
"""
40+
41+
42+
from __future__ import print_function
43+
44+
import os
45+
46+
from webexteamssdk import WebexTeamsAPI
47+
48+
49+
__author__ = "Jeff Levensailor"
50+
__author_email__ = "jeff@levensailor.com"
51+
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
52+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
53+
__license__ = "MIT"
54+
55+
56+
ROOM_ID = "<your_room_id>"
57+
FILE_PATH = "<the_path_to_the_local_file>"
58+
59+
60+
# Create a WebexTeamsAPI connection object; uses your WEBEX_TEAMS_ACCESS_TOKEN
61+
api = WebexTeamsAPI()
62+
63+
64+
# Let's make sure the file exists
65+
if not os.path.isfile(FILE_PATH):
66+
print("ERROR: File {} does not exist.".format(FILE_PATH))
67+
68+
69+
# Not a requirement but to be completely clear let's make sure we are using
70+
# an absolute path.
71+
abs_path = os.path.abspath(FILE_PATH)
72+
73+
74+
# The files parameter expects to receive a list containing a single string with
75+
# the path to the file to be uploaded.
76+
file_list = [abs_path]
77+
78+
79+
# It takes just a single statement to upload the file and create the message
80+
api.messages.create(roomId=ROOM_ID, files=file_list)

‎examples/ngrokwebhook.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
To use script simply launch ngrok, and then launch this script. After ngrok is
1414
killed, run this script a second time to remove webhook from Webex Teams.
1515
16-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
16+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
1717
1818
Permission is hereby granted, free of charge, to any person obtaining a copy
1919
of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,7 @@
4848
__author__ = "Brad Bester"
4949
__author_email__ = "brbester@cisco.com"
5050
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
51-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
51+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
5252
__license__ = "MIT"
5353

5454

‎examples/people.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
WEBEX_TEAMS_ACCESS_TOKEN environment variable. You must have this environment
77
variable set to run this script.
88
9-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
9+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
1010
1111
Permission is hereby granted, free of charge, to any person obtaining a copy
1212
of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@
4040
__author__ = "Jose Bogarín Solano"
4141
__author_email__ = "jose@bogarin.co.cr"
4242
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
43-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
43+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
4444
__license__ = "MIT"
4545

4646
from webexteamssdk import WebexTeamsAPI

‎examples/pyramidWebexTeamsBot/pyramidWebexTeamsBot/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
"""Main entry point.
33
4-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
2626
__author__ = "Jose Bogarín Solano"
2727
__author_email__ = "jose@bogarin.co.cr"
2828
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
29-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
29+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
3030
__license__ = "MIT"
3131

3232

‎examples/pyramidWebexTeamsBot/pyramidWebexTeamsBot/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
2323
This script supports Python versions 2 and 3.
2424
25-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
2626
2727
Permission is hereby granted, free of charge, to any person obtaining a copy
2828
of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@
6060
"Brad Bester <brbester@cisco.com>",
6161
"Chris Lunsford <chrlunsf@cisco.com>",
6262
]
63-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
63+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
6464
__license__ = "MIT"
6565

6666

‎examples/pyramidWebexTeamsBot/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
"""A simple bot script, built on Pyramid using Cornice.
33
4-
Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
2525
__author__ = "Jose Bogarín Solano"
2626
__author_email__ = "jose@bogarin.co.cr"
2727
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
28-
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
28+
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
2929
__license__ = "MIT"
3030

3131

‎examples/simple.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@
1010
WEBEX_TEAMS_ACCESS_TOKEN environment variable. You must have this environment
1111
variable set to run this script.
1212
13+
14+
Copyright (c) 2016-2019 Cisco and/or its affiliates.
15+
16+
Permission is hereby granted, free of charge, to any person obtaining a copy
17+
of this software and associated documentation files (the "Software"), to deal
18+
in the Software without restriction, including without limitation the rights
19+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
20+
copies of the Software, and to permit persons to whom the Software is
21+
furnished to do so, subject to the following conditions:
22+
23+
The above copyright notice and this permission notice shall be included in all
24+
copies or substantial portions of the Software.
25+
26+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32+
SOFTWARE.
1333
"""
1434

1535

‎requirements.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ attrs==18.2.0
55
Babel==2.6.0
66
backcall==0.1.0
77
bleach==3.0.2
8-
certifi==2018.10.15
8+
certifi==2018.11.29
99
chardet==3.0.4
1010
decorator==4.3.0
1111
docutils==0.14
1212
flake8==3.6.0
1313
future==0.17.1
14-
idna==2.7
14+
idna==2.8
1515
imagesize==1.1.0
16-
ipython==7.1.1
16+
ipython==7.2.0
1717
ipython-genutils==0.2.0
18-
jedi==0.13.1
18+
jedi==0.13.2
1919
Jinja2==2.10
20-
MarkupSafe==1.0
20+
MarkupSafe==1.1.0
2121
mccabe==0.6.1
22-
more-itertools==4.3.0
22+
more-itertools==5.0.0
2323
packaging==18.0
2424
parso==0.3.1
2525
pexpect==4.6.0
@@ -31,24 +31,24 @@ ptyprocess==0.6.0
3131
py==1.7.0
3232
pycodestyle==2.4.0
3333
pyflakes==2.0.0
34-
Pygments==2.2.0
35-
pyparsing==2.2.2
36-
pytest==3.9.3
34+
Pygments==2.3.1
35+
pyparsing==2.3.0
36+
pytest==4.0.2
3737
pytz==2018.7
3838
readme-renderer==24.0
39-
requests==2.20.0
39+
requests==2.21.0
4040
requests-toolbelt==0.8.0
4141
simplegeneric==0.8.1
42-
six==1.11.0
42+
six==1.12.0
4343
snowballstemmer==1.2.1
44-
Sphinx==1.8.1
44+
Sphinx==1.8.3
4545
sphinx-rtd-theme==0.4.2
4646
sphinxcontrib-websupport==1.1.0
4747
tqdm==4.28.1
4848
traitlets==4.3.2
4949
twine==1.12.1
50-
urllib3==1.24
50+
urllib3==1.24.1
5151
versioneer==0.18
5252
wcwidth==0.1.7
5353
webencodings==0.5.1
54-
-e git+https://github.com/CiscoDevNet/webexteamssdk.git@ff60f16f8265eeaf4006125d553eef5ccef6734d#egg=webexteamssdk
54+
-e git+https://github.com/CiscoDevNet/webexteamssdk.git@719b58614b91b0a0d48179f4cb0a8d5be609686d#egg=webexteamssdk

‎script/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Build the project's product(s).
33
#
4-
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
# License: MIT
66

77

‎script/ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Run the project's test suite.
33
#
4-
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
# License: MIT
66

77

‎script/clean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Clean the project directory.
33
#
4-
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
# License: MIT
66

77

‎script/console

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Open the project's console.
33
#
4-
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
4+
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
55
# License: MIT
66

77

0 commit comments

Comments
 (0)