Merge branch 'main' into selective_stream

Author: geekchick

.bumpversion.cfg

@@ -0,0 +1,6 @@
+[bumpversion]
+current_version = 3.1.0
+commit = True
+tag = False
+
+[bumpversion:file:opentok/version.py]

.github/workflows/ot.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7]
+        python-version: [3.5, 3.6, 3.7, 3.8.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

DEVELOPING.md

@@ -16,12 +16,30 @@ this project. If you use this package within your own software as is but don't p
    location on your system, which helps keep you out of dependency hell. You can exit the
    environment using `$ deactivate`.
 
-*  [tox](https://testrun.org/tox/): a testing automation tool that can load many Python versions.
-   This tool allows the project to test against all the compatible versions of Python by leveraging
-   virtualenv and describing the tasks in a metadata file.
+*  [act](https://github.com/nektos/act): a tool for running Github Actions locally. This tool allows
+   developers to easily replicate the same Continuous Integration pipelines we use for code validation.
 
 ## Tasks
 
+## Setup
+
+We currently recommend setting up a development environment using `virtualenv` and installing dependencies
+with `pip`. While the Python Packaging Authority recommends `Pipenv` to manage dependencies, `Pipenv` does
+not install the OpenTok library correctly from source at this time.
+
+We recommend setting up a Python 3.5 or higher `virtualenv` environment. This allows you to isolate dependencies
+for work on the OpenTok library without interfering with any other projects or installations on your system.
+
+    $ virtualenv env
+    $ source env/bin/activate
+    $ pip install -r requirements.txt -r test_requirements.txt
+
+Some IDEs, like Visual Studio Code, will automatically detect the `virtualenv` and use it. 
+
+When you are done, you can leave the `virtualenv` by deactivating it:
+
+    $ deactivate
+
 ### Building
 
 Building isn't necessarily required for a python package, but it is possible. By running the command
@@ -32,10 +50,19 @@ other script in your environment, and continue to update and you make changes.
 
 ### Testing
 
-This project's tests are kicked off by tox. The `tox.ini` file describes the automation. In
-a nutshell, it selects a Python version, installs test dependencies stored in
-`test_requirements.txt`, and then runs `nosetests`. [Nose](https://nose.readthedocs.org) is the
-actual test runner. All of this can be ran using the following command: `$ tox`
+This project's tests are built using the `unittest` [`Nose'](https://nose.readthedocs.org) modules.
+To run the unit tests, install the core as well as development dependencies inside your `virtualenv`:
+
+    $ pip install -r requirements.txt -r test_requirements.txt
+
+You can manually run the test suite for your version of python with:
+
+    $ nosetests
+
+If you would like to run the test suite against a variety of Python versions, we recommend installing
+`act` and running out Github Action "test" workflow:
+
+    $ act --quiet
 
 ### Generating Documentation
 
@@ -45,19 +72,28 @@ actual test runner. All of this can be ran using the following command: `$ tox`
 
 In order to create a release, the following should be completed in order.
 
-1. Ensure all tests are passing (`tox`) and that there is enough test coverage.
+#### Prep the release
+
+1. Ensure all tests are passing (`act`) and that there is enough test coverage.
 1. Make sure you are on the `master` branch of the repository, with all changes merged/committed already.
-1. Update the version number in the source code (`opentok/version.py`) and the README. See [Versioning](#versioning) for
+1. Create a new branch named `release-x.y.z`, with the release version number
+1. Update the version number with `bumpversion`. See [Versioning](#versioning) for
    information about selecting an appropriate version number.
 1. Commit the version number change with the message ("Update to version v.x.x.x"), substituting the new version number.
+1. Create a new pull request with this branch
+
+#### Once PR is merged into `master`
+1. Make sure you are on the `master` branch of the repository
+1. Run `git pull --rebase origin master` to make sure your local code is up-to-date
 1. Create a git tag: `git tag -a vx.y.z -m "Release vx.y.z"`
+1. Run `git push origin vx.y.z` to push the tag to Github
 1. Ensure you have permission to update the `opentok` package on PyPI: <https://pypi.python.org/pypi/opentok>.
-1. Run `python setup.py sdist upload`, which will build and upload the package to PyPI.
-1. Change the version number for future development by adding "a1", then make another commit with the message
-   "Beginning development on next version".
-1. Push the changes to the main repository (`git push origin master`).
-1. Upload the `dist/opentok-x.y.z.tar.gz` file to the
-   [Github Releases](https://github.com/opentok/opentok-python-sdk/releases) page with a description and release notes.
+1. Run the deploy scripts:
+  1. `make clean`
+  1. `make dist`
+  1. `make release`
+1. Create a new release on the [Github Releases](https://github.com/opentok/opentok-python-sdk/releases) page,
+   and attach the files in `dist/` to the release
 
 ## Workflow
 
@@ -73,10 +109,6 @@ from 1.
 ### Branches
 
 *  `master` - the main development branch.
-*  `feat.foo` - feature branches. these are used for longer running tasks that cannot be accomplished in one commit.
-   once merged into master, these branches should be deleted.
-*  `vx.x.x` - if development for a future version/milestone has begun while master is working towards a sooner
-   release, this is the naming scheme for that branch. once merged into master, these branches should be deleted.
 
 ### Tags
 

Makefile

@@ -0,0 +1,26 @@
+.PHONY: clean test dist coverage install requirements release release-test
+
+clean:
+	rm -rf dist build
+
+coverage:
+	pytest -v --cov
+	coverage html
+
+test:
+	nosetests -v
+
+dist:
+	python setup.py sdist --formats zip,gztar bdist_wheel
+
+release:
+	twine upload dist/*
+
+install: requirements
+
+requirements: .requirements.txt
+
+.requirements.txt: requirements.txt
+	python -m pip install --upgrade pip setuptools
+	python -m pip install -r requirements.txt
+	python -m pip freeze > .requirements.txt

README.rst

@@ -502,7 +502,7 @@ Requirements
 
 You need an OpenTok API key and API secret, which you can obtain at https://dashboard.tokbox.com/
 
-The OpenTok Python SDK requires Python 2.6, 2.7, 3.3, 3.4, 3.5 or 3.6
+The OpenTok Python SDK requires Python 3.5 or higher
 
 Release Notes
 -------------

opentok/endpoints.py

@@ -7,6 +7,7 @@ class Endpoints(object):
     Class that provides the endpoint urls
     """
 
+
     def __init__(self, api_url, api_key):
         self.api_url = api_url
         self.api_key = api_key
@@ -152,5 +153,3 @@ def get_broadcast_stream(self, broadcast_id=None):
             + broadcast_id
             + "/streams"
         )
-
-    

opentok/opentok.py

@@ -15,6 +15,7 @@
 import random  # _create_jwt_auth_header
 import logging  # logging
 import warnings  # Native. Used for notifying deprecations
+import os
 
 
 # compat
@@ -84,8 +85,6 @@ class ArchiveModes(Enum):
 
 logger = logging.getLogger("opentok")
 
-
-
 class Client(object):
 
     """Use this SDK to create tokens and interface with the server-side portion
@@ -405,6 +404,7 @@ def create_session(
                 proxies=self.proxies,
                 timeout=self.timeout,
             )
+           
             response.encoding = "utf-8"
 
             if response.status_code == 403:
@@ -1561,6 +1561,8 @@ def _create_jwt_auth_header(self):
         }
 
         return jwt.encode(payload, self.api_secret, algorithm="HS256")
+                
+  
 
 class OpenTok(Client):
     def __init__(
@@ -1583,3 +1585,5 @@ def __init__(
             timeout=timeout,
             app_version=app_version
         )
+
+   

setup.py

@@ -62,10 +62,11 @@ def find_version(*file_paths):
         'License :: OSI Approved :: MIT License',
 
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
 
         'Topic :: Communications',
         'Topic :: Communications :: Chat',

test_requirements.txt

@@ -2,4 +2,6 @@ nose
 httpretty
 expects
 wheel
-sure
+twine
+bump2version
+sure

tests/test_opentok.py

@@ -0,0 +1,75 @@
+import unittest
+from requests.models import Response
+
+from six import text_type, u, b, PY2, PY3
+from nose.tools import raises
+
+import requests
+import httpretty
+from sure import expect
+import random
+import string
+
+import json
+
+import opentok
+from opentok import Client, OpenTok
+
+
+class OpenTokTest(unittest.TestCase):  
+    def setUp(self):
+        self.api_key = "123456"
+        self.api_secret = "1234567890abcdef1234567890abcdef1234567890"
+        self.session_id = "SESSIONID"
+        self.opentok = Client(self.api_key, self.api_secret)
+        token = string.ascii_letters+string.digits
+        self.jwt_token_string = ''.join(random.choice(token[:100]))
+        self.stream_id_1 = "Stream1"
+
+    @httpretty.activate
+    def test_mute_all_response(self):
+        self.url = "https://api.opentok.com/v2/project/{0}/session/{1}/mute".format(
+                                                                                self.api_key, 
+                                                                                self.session_id)
+
+        httpretty.register_uri(httpretty.POST, 
+                                        self.url, 
+                                        responses=[
+                                            httpretty.Response(body="Testing text matches inside of the JSON file", 
+                                                               content_type="application/json",
+                                                               adding_headers= {"x-opentok-auth": self.jwt_token_string},
+                                                               status=201)
+                                        ])
+
+    
+        response = requests.post(self.url)
+
+        response.status_code.should.equal(201)
+        response.text.should.equal("Testing text matches inside of the JSON file")
+        response.headers["x-opentok-auth"].should.equal(self.jwt_token_string)
+        response.headers["Content-Type"].should.equal("application/json")
+
+    @httpretty.activate
+    def test_mute_stream_response(self):
+        self.url = "https://api.opentok.com/v2/project/${0}/session/${1}/stream/${2}/mute".format(
+                                                                                                self.api_key, 
+                                                                                                self.session_id,
+                                                                                                self.stream_id_1)
+
+        httpretty.register_uri(httpretty.POST, 
+                                        self.url, 
+                                        responses=[
+                                            httpretty.Response(body="Testing body of the JSON file", 
+                                                               content_type="application/json",
+                                                               adding_headers= {"x-opentok-auth": self.jwt_token_string},
+                                                               status=201)
+                                        ])
+
+    
+        response = requests.post(self.url)
+
+        response.status_code.should.equal(201)
+        response.text.should.equal("Testing body of the JSON file")
+        response.headers["x-opentok-auth"].should.equal(self.jwt_token_string)
+        response.headers["Content-Type"].should.equal("application/json")
+