Skip to content

Commit 49a0a0d

Browse files
authored
Merge pull request #132 from CiscoDevNet/v1.x
v1.6 - The Catch-Up Release
2 parents 27178df + c8aa0bb commit 49a0a0d

Some content is hidden

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

101 files changed

+709
-266
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2019 Cisco and/or its affiliates.
3+
Copyright (c) 2016-2020 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

README.rst

+38-26
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,22 @@ webexteamssdk
1515
.. image:: https://readthedocs.org/projects/webexteamssdk/badge/?version=latest
1616
:target: http://webexteamssdk.readthedocs.io/en/latest/?badge=latest
1717

18-
-------------------------------------------------------------------------------
18+
------------------------------------------------------------------------------------------------------------------------
1919

2020

21-
Looking for ``ciscosparkapi``? You are in the right place. ``ciscosparkapi`` is now ``webexteamssdk``! It still has all of the native and natural Webex Teams Python functionality that you love and now we have made room for even more functionality to be added in the future.
21+
With release v1.6 we are wrapping up active development on the v1.x release and shifting our focus to the next major
22+
release v2! Please see the work-in-progress `Release Plan`_ and contribute your ideas for v2.x enhancements by either
23+
opening enhancement issues_ or by joining our
24+
`webexteamssdk - Webex Teams SDK - Python Community Contributors <https://eurl.io/#BJ0A8gfOQ>`_ space and posting your
25+
ideas there.
2226

23-
We will maintain the ``ciscosparkapi`` package (bug fixes, etc.) in the `ciscosparkapi`_ branch of this repository and continue to publish package updates with these fixes to PyPI (through the end of 2019). Maintaining the ``ciscosparkapi`` package should keep your code and projects up and running while giving you 12+ months to migrate your code to the new ``webexteamssdk`` library.
27+
------------------------------------------------------------------------------------------------------------------------
2428

25-
*Migration Note:* Migrating should be easy. The ``WebexTeamsAPI`` class and the Python objects returned by the API calls are nearly identical to their ``CiscoSparkAPI`` predecessors. Does the word "nearly" scare you? Here are some specifics:
2629

27-
* The obvious top-level name change from ``CiscoSparkAPI`` to ``WebexTeamsAPI``.
28-
* ``WebexTeamsAPI``'s API structure: method and attribute names are *identical*.
29-
* The returned Python objects (now derivatives of an `ImmutableData` base class) are now immutable; so you can use them in sets and as keys in dictionaries.
30-
* ``WebexTeamsAPI`` converts object attributes that contain data-time strings (like a room's creation date) to Python ``datetime``'s (actually a derived class that has been customized to model the Webex Teams data-time format)
30+
**webexteamssdk** is a *community developed* Python library for working with the Webex Teams APIs. Our goal is to make
31+
working with Webex Teams in Python a *native* and *natural* experience!
3132

32-
There is also some new functionality under the hood that we will document, communicate, and generally make available in the future.
33-
34-
35-
-------------------------------------------------------------------------------
36-
37-
38-
**webexteamssdk** is a *community developed* Python library for working with the Webex Teams APIs. Our goal is to make working with Webex Teams in Python a *native* and *natural* experience!
39-
40-
.. code-block:: python
33+
.. code-block:: Python
4134
4235
from webexteamssdk import WebexTeamsAPI
4336
@@ -64,7 +57,8 @@ There is also some new functionality under the hood that we will document, commu
6457
files=["https://www.webex.com/content/dam/wbx/us/images/dg-integ/teams_icon.png"])
6558
6659
67-
That's more than 6 Webex Teams API calls in less than 23 lines of code (with comments and whitespace), and likely more than that since webexteamssdk handles pagination_ for you automatically!
60+
That's more than 6 Webex Teams API calls in less than 23 lines of code (with comments and whitespace), and likely more
61+
than that, since webexteamssdk handles pagination_ for you automatically!
6862

6963
webexteamssdk makes your life better... `Learn how!`__
7064

@@ -78,7 +72,8 @@ webexteamssdk does all of this for you:
7872

7973
* Transparently sources your Webex Teams access token from your local environment
8074

81-
* Provides and uses default arguments and settings everywhere possible, so you don't have to think about things like API endpoint URLs, HTTP headers and JSON formats
75+
* Provides and uses default arguments and settings everywhere possible, so you don't have to think about things like API
76+
endpoint URLs, HTTP headers and JSON formats
8277

8378
* Represents all Webex Teams API interactions using native Python tools
8479

@@ -108,7 +103,7 @@ Installing and upgrading webexteamssdk is easy:
108103
109104
$ pip install webexteamssdk
110105
111-
**Upgrading to the latest Version**
106+
**Upgrade to the latest version**
112107

113108
.. code-block:: bash
114109
@@ -137,29 +132,45 @@ __ Contribution_
137132
Release Notes
138133
-------------
139134

140-
Please see the releases_ page for release notes on the incremental functionality and bug fixes incorporated into the published releases.
135+
Please see the releases_ page for release notes on the incremental functionality and bug fixes incorporated into the
136+
published releases.
141137

142138

143139
Questions, Support & Discussion
144140
-------------------------------
145141

146-
webexteamssdk is a *community developed* and *community supported* project. If you experience any issues using this package, please report them using the issues_ page.
142+
webexteamssdk is a *community developed* and *community-supported* project. If you experience any issues using this
143+
package, please report them using the issues_ page.
147144

148-
Please join the `Python Webex Teams Devs`__ Webex Teams space to ask questions, join the discussion, and share your projects and creations.
145+
Please join the `Python Webex Teams Devs`__ Webex Teams space to ask questions, join the discussion, and share your
146+
projects and creations.
149147

150148
__ Community_
151149

152150

153151
Contribution
154152
------------
155153

156-
webexteamssdk_ is a community development projects. Feedback, thoughts, ideas, and code contributions are welcome! Please see the `Contributing`_ guide for more information.
154+
webexteamssdk_ is a community development project. Feedback, thoughts, ideas, and code contributions are welcome!
155+
Please see the `Contributing`_ guide for more information.
157156

158157

159-
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
158+
History
159+
-------
160160

161+
The Webex Teams SDK (webexteamssdk) library started as Cisco Spark API (ciscosparkapi). We updated the library's name in
162+
alignment with Cisco's re-brand of Cisco Spark to Webex Teams. The Cisco Spark API library has been deprecated and is no
163+
longer supported; however, its open-source codebase is still available in the `ciscosparkapi`_ branch of this
164+
repository.
161165

162-
.. _ciscosparkapi: https://github.com/CiscoDevNet/ciscosparkapi/tree/ciscosparkapi
166+
The development team may make additional name changes as the library evolves with the Webex APIs published on
167+
developer.webex.com.
168+
169+
170+
*Copyright (c) 2016-2020 Cisco and/or its affiliates.*
171+
172+
173+
.. _Release Plan: https://github.com/CiscoDevNet/webexteamssdk/wiki/Release-Plans
163174
.. _Introduction: http://webexteamssdk.readthedocs.io/en/latest/user/intro.html
164175
.. _pagination: https://developer.webex.com/pagination.html
165176
.. _webexteamssdk.readthedocs.io: https://webexteamssdk.readthedocs.io
@@ -174,3 +185,4 @@ webexteamssdk_ is a community development projects. Feedback, thoughts, ideas,
174185
.. _the repository: webexteamssdk_
175186
.. _pull request: `pull requests`_
176187
.. _Contributing: https://github.com/CiscoDevNet/webexteamssdk/blob/master/docs/contributing.rst
188+
.. _ciscosparkapi: https://github.com/CiscoDevNet/ciscosparkapi/tree/ciscosparkapi

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

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

docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Webex Teams for Developers
6666
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.
6767

6868

69-
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
69+
*Copyright (c) 2016-2020 Cisco and/or its affiliates.*
7070

7171

7272
.. _free account: `Webex Teams`

docs/installation.rst

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

6363

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

docs/user/api.rst

+11-2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,15 @@ Room
257257
:inherited-members:
258258

259259

260+
.. _RoomMeetingInfo:
261+
262+
Room Meeting Info
263+
-----------------
264+
265+
.. autoclass:: RoomMeetingInfo()
266+
:inherited-members:
267+
268+
260269
.. _Team:
261270

262271
Team
@@ -266,7 +275,7 @@ Team
266275
:inherited-members:
267276

268277

269-
.. _Team Membership:
278+
.. _TeamMembership:
270279

271280
Team Membership
272281
---------------
@@ -425,4 +434,4 @@ Actions
425434

426435
.. autoclass:: webexteamssdk.cards.actions.ShowCard
427436

428-
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
437+
*Copyright (c) 2016-2020 Cisco and/or its affiliates.*

docs/user/api_structure_table.rst

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
| | | :meth:`delete() <webeteamssdk.api.memberships.MembershipsAPI.delete>` |
2323
+------------------------+---------------------------+---------------------------------------------------------------------------------+
2424
| | :ref:`messages` | :meth:`list() <webeteamssdk.api.messages.MessagesAPI.list>` |
25+
| | | :meth:`list_direct() <webeteamssdk.api.messages.MessagesAPI.list_direct>` |
2526
| | | :meth:`create() <webeteamssdk.api.messages.MessagesAPI.create>` |
2627
| | | :meth:`get() <webeteamssdk.api.messages.MessagesAPI.get>` |
2728
| | | :meth:`delete() <webeteamssdk.api.messages.MessagesAPI.delete>` |
@@ -41,6 +42,7 @@
4142
| | :ref:`rooms` | :meth:`list() <webeteamssdk.api.rooms.RoomsAPI.list>` |
4243
| | | :meth:`create() <webeteamssdk.api.rooms.RoomsAPI.create>` |
4344
| | | :meth:`get() <webeteamssdk.api.rooms.RoomsAPI.get>` |
45+
| | | :meth:`get_meeting_info() <webeteamssdk.api.rooms.RoomsAPI.get_meeting_info>` |
4446
| | | :meth:`update() <webeteamssdk.api.rooms.RoomsAPI.update>` |
4547
| | | :meth:`delete() <webeteamssdk.api.rooms.RoomsAPI.delete>` |
4648
+------------------------+---------------------------+---------------------------------------------------------------------------------+

docs/user/intro.rst

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

153153

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

156156

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

docs/user/quickstart.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -473,21 +473,21 @@ Extending the API with bound methods
473473
------------------------------------
474474

475475
As the Webex Teams API is developed and features are added, it may be necessary to extend the webexteamssdk to access those features.
476-
Extending the API is simple by binding your own methods to the WebexTeamsAPI connection object. By binding a method, you can
476+
Extending the API is simple by binding your own methods to the WebexTeamsAPI connection object. By binding a method, you can
477477
extend functionality and leverage all of the objects and quality of life features of webexteamssdk.
478478

479479
.. code-block:: python
480480
481481
>>> new_method(self, param):
482482
... json_obj = self._session.get('/example/action/' + param)
483483
... return json_obj
484-
484+
485485
>>> api = WebexTeamsAPI()
486486
>>> api.new_method = new_method
487487
>>> output = WebexTeamsAPI.new_method(param)
488488
489489
490-
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
490+
*Copyright (c) 2016-2020 Cisco and/or its affiliates.*
491491

492492

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

examples/bot-example-flask.py

+2-2
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-2019 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
60+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
6161
__license__ = "MIT"
6262

6363

examples/bot-example-webpy.py

+2-2
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-2019 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
60+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
6161
__license__ = "MIT"
6262

6363

examples/local_file_upload.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
variable set to run this script.
1818
1919
20-
Copyright (c) 2016-2019 Cisco and/or its affiliates.
20+
Copyright (c) 2016-2020 Cisco and/or its affiliates.
2121
2222
Permission is hereby granted, free of charge, to any person obtaining a copy
2323
of this software and associated documentation files (the "Software"), to deal
@@ -49,7 +49,7 @@
4949
__author__ = "Jeff Levensailor"
5050
__author_email__ = "jeff@levensailor.com"
5151
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
52-
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
52+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
5353
__license__ = "MIT"
5454

5555

examples/ngrokwebhook.py

+2-2
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-2019 Cisco and/or its affiliates.
16+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
51+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
5252
__license__ = "MIT"
5353

5454

examples/people.py

+2-2
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-2019 Cisco and/or its affiliates.
9+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
43+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
4444
__license__ = "MIT"
4545

4646
from webexteamssdk import WebexTeamsAPI

examples/pyramidWebexTeamsBot/pyramidWebexTeamsBot/__init__.py

+2-2
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-2019 Cisco and/or its affiliates.
4+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
29+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
3030
__license__ = "MIT"
3131

3232

examples/pyramidWebexTeamsBot/pyramidWebexTeamsBot/views.py

+2-2
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-2019 Cisco and/or its affiliates.
25+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
63+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
6464
__license__ = "MIT"
6565

6666

examples/pyramidWebexTeamsBot/setup.py

+2-2
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-2019 Cisco and/or its affiliates.
4+
Copyright (c) 2016-2020 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-2019 Cisco and/or its affiliates."
28+
__copyright__ = "Copyright (c) 2016-2020 Cisco and/or its affiliates."
2929
__license__ = "MIT"
3030

3131

examples/simple.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
variable set to run this script.
1212
1313
14-
Copyright (c) 2016-2019 Cisco and/or its affiliates.
14+
Copyright (c) 2016-2020 Cisco and/or its affiliates.
1515
1616
Permission is hereby granted, free of charge, to any person obtaining a copy
1717
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)