Skip to content

Commit

Permalink
Merge pull request #74 and #78 from CiscoDevNet/pr/74
Browse files Browse the repository at this point in the history
Incorporating ***new*** GuestIssuer functionality created by @sQu4rks !
  • Loading branch information
cmlccie committed Apr 2, 2019
2 parents 053d977 + ce8e8d5 commit 4dc7e5f
Show file tree
Hide file tree
Showing 83 changed files with 289 additions and 88 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

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

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Contribution
webexteamssdk_ is a community development projects. Feedback, thoughts, ideas, and code contributions are welcome! Please see the `Contributing`_ guide for more information.


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


.. _ciscosparkapi: https://github.com/CiscoDevNet/ciscosparkapi/tree/ciscosparkapi
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


project = u'webexteamssdk'
copyright = u'Copyright (c) 2016-2018 Cisco and/or its affiliates.'
copyright = u'Copyright (c) 2016-2019 Cisco and/or its affiliates.'
author = u'Chris Lunsford'
version = get_versions()['version']
release = get_versions()['version']
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Webex Teams for Developers
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.


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


.. _free account: `Webex Teams`
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ command:
$ python setup.py install
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*


.. _Python Package Index (PyPI): https://pypi.python.org/pypi/webexteamssdk
Expand Down
2 changes: 1 addition & 1 deletion docs/user/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,4 @@ Warnings
:members:


*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*
2 changes: 1 addition & 1 deletion docs/user/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ webexteamssdk License
.. include:: ../../LICENSE


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


.. _MIT Open Source License: https://opensource.org/licenses/MIT
Expand Down
2 changes: 1 addition & 1 deletion docs/user/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ contain all of the returned objects.
>>> rooms_list = list(rooms_iterable)
*Copyright (c) 2016-2018 Cisco and/or its affiliates.*
*Copyright (c) 2016-2019 Cisco and/or its affiliates.*


.. _Webex Teams: https://www.webex.com/products/teams/index.html
Expand Down
4 changes: 2 additions & 2 deletions examples/bot-example-flask.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
This script supports Python versions 2 and 3.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -57,7 +57,7 @@
__author__ = "Chris Lunsford"
__author_email__ = "chrlunsf@cisco.com"
__contributors__ = ["Brad Bester <brbester@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
4 changes: 2 additions & 2 deletions examples/bot-example-webpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
the time of this writing web.py (v0.38) only supports Python 2.
Therefore this script only supports Python 2.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -57,7 +57,7 @@
__author__ = "Brad Bester"
__author_email__ = "brbester@cisco.com"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
7 changes: 7 additions & 0 deletions examples/local_file_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
from webexteamssdk import WebexTeamsAPI


__author__ = "Jeff Levensailor"
__author_email__ = "jeff@levensailor.com"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


ROOM_ID = "<your_room_id>"
FILE_PATH = "<the_path_to_the_local_file>"

Expand Down
4 changes: 2 additions & 2 deletions examples/ngrokwebhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
To use script simply launch ngrok, and then launch this script. After ngrok is
killed, run this script a second time to remove webhook from Webex Teams.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -48,7 +48,7 @@
__author__ = "Brad Bester"
__author_email__ = "brbester@cisco.com"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
4 changes: 2 additions & 2 deletions examples/people.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
WEBEX_TEAMS_ACCESS_TOKEN environment variable. You must have this environment
variable set to run this script.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -40,7 +40,7 @@
__author__ = "Jose Bogarín Solano"
__author_email__ = "jose@bogarin.co.cr"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"

from webexteamssdk import WebexTeamsAPI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Main entry point.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -26,7 +26,7 @@
__author__ = "Jose Bogarín Solano"
__author_email__ = "jose@bogarin.co.cr"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
4 changes: 2 additions & 2 deletions examples/pyramidWebexTeamsBot/pyramidWebexTeamsBot/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
This script supports Python versions 2 and 3.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -60,7 +60,7 @@
"Brad Bester <brbester@cisco.com>",
"Chris Lunsford <chrlunsf@cisco.com>",
]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
4 changes: 2 additions & 2 deletions examples/pyramidWebexTeamsBot/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""A simple bot script, built on Pyramid using Cornice.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -25,7 +25,7 @@
__author__ = "Jose Bogarín Solano"
__author_email__ = "jose@bogarin.co.cr"
__contributors__ = ["Chris Lunsford <chrlunsf@cisco.com>"]
__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


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


Expand Down
2 changes: 1 addition & 1 deletion script/build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Build the project's product(s).
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/ci
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Run the project's test suite.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/clean
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Clean the project directory.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/console
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Open the project's console.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/installdeps
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Install all the development dependencies for this project.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/ipython_console.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import webexteamssdk

__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down
2 changes: 1 addition & 1 deletion script/setup
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Setup or reset the project to its initial state.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Run the project's test suite(s).
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
2 changes: 1 addition & 1 deletion script/update
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Update the project's dependencies.
#
# Copyright (c) 2016-2018 Cisco and/or its affiliates.
# Copyright (c) 2016-2019 Cisco and/or its affiliates.
# License: MIT


Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import versioneer


__copyright__ = "Copyright (c) 2016-2018 Cisco and/or its affiliates."
__copyright__ = "Copyright (c) 2016-2019 Cisco and/or its affiliates."
__license__ = "MIT"


Expand Down Expand Up @@ -50,6 +50,7 @@
'future',
'requests>=2.4.2',
'requests-toolbelt',
'PyJWT'
]


Expand Down
2 changes: 1 addition & 1 deletion tests/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_events.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI Events API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_licenses.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI Licenses API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_memberships.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI Memberships API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_messages.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI Messages API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_organizations.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI Organizations API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion tests/api/test_people.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""WebexTeamsAPI People API fixtures and tests.
Copyright (c) 2016-2018 Cisco and/or its affiliates.
Copyright (c) 2016-2019 Cisco and/or its affiliates.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit 4dc7e5f

Please sign in to comment.