feature: Enable python3.6 backward compatibility

Author: diningPhilosopher64

.github/workflows/release.yml

@@ -38,21 +38,22 @@ jobs:
         with:
           ref: ${{github.sha}}
 
-      - name: Set up Python 3.7
+      - name: Set up Python 3.6
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.6
 
       - name: Install dependencies
+      # Installing wheel package will slightly speed-up installing dependencies.
+      # Installing the package with "[dev]" flag  will install test dependecies as well,
+      # enabling us to run pytest.
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --upgrade black
-
-      - name: Lint with black
-        run: black --check .
+          python -m pip install wheel
+          pip install .[dev]
 
       - name: Run Python Tests
-        run: python setup.py test
+        run: python -m pytest
 
   build_and_publish:
     needs: [python_tests, node_tests]
@@ -65,10 +66,10 @@ jobs:
         with:
           ref: ${{github.sha}}
 
-      - name: Set up Python 3.7
+      - name: Set up Python 3.6
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.6
 
       - name: Use Node.js 13.x
         uses: actions/setup-node@v2

.github/workflows/run-tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
       - name: Checkout
@@ -43,17 +43,19 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
+      # Installing wheel package will slightly speed-up installing dependencies.
+      # Installing the package with "[dev]" flag  will install test dependecies as well, 
+      # enabling us to run pytest.
         run: |
           python -m pip install --upgrade pip
-          pip install black pytest
+          python -m pip install wheel
+          pip install .[dev]
 
       - name: Lint with black
-        run: |
-          black --check .
+        run: black --check .
 
       - name: Test with pytest
-        run: |
-          python setup.py test
+        run: python -m pytest
 
   generate_and_upload_code_coverage:
     needs: [python_tests, node_tests]
@@ -75,7 +77,9 @@ jobs:
 
       - name: Install Python build dependencies
         run: |
-          pip install -e .[DEV]
+          python -m pip install --upgrade pip
+          python -m pip install wheel
+          pip install .[dev]
 
       - name: Generate Code Coverage report for Python code
         run: |

jupyter_matlab_proxy/app_state.py

@@ -3,9 +3,11 @@
 import asyncio
 from jupyter_matlab_proxy import mwi_environment_variables as mwi_env
 from jupyter_matlab_proxy import mwi_embedded_connector as mwi_connector
+from jupyter_matlab_proxy import util
 import os
 import json
 import pty
+import sys
 import logging
 from datetime import datetime, timezone, timedelta
 import socket
@@ -460,7 +462,12 @@ async def matlab_stderr_reader():
                 self.logs["matlab"].append(line)
             await self.handle_matlab_output()
 
-        loop = asyncio.get_running_loop()
+        loop = (
+            asyncio.get_running_loop()
+            if util.is_python_version_newer_than_3_6()
+            else asyncio.get_event_loop()
+        )
+
         self.tasks["matlab_stderr_reader"] = loop.create_task(matlab_stderr_reader())
 
     async def stop_matlab(self):

jupyter_matlab_proxy/devel.py

@@ -140,7 +140,11 @@ def matlab(args):
     from pathlib import Path
 
     parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers(dest="cmd", required=True)
+    subparsers = (
+        parser.add_subparsers(dest="cmd", required=True)
+        if sys.version_info[:2] >= (3, 7)
+        else parser.add_subparsers(dest="cmd")
+    )
     matlab_parser = subparsers.add_parser("matlab")
     matlab_parser.add_argument("--ready-delay", default=2, type=int)
     matlab_parser.set_defaults(func=matlab)

jupyter_matlab_proxy/util/__init__.py

@@ -1 +1,11 @@
 # Copyright 2020 The MathWorks, Inc.
+import sys
+
+
+def is_python_version_newer_than_3_6():
+    """Returns True if the python version being used is 3.7 or higher, else False.
+
+    Returns:
+        Boolean: True if python version >= 3.7, False otherwise.
+    """
+    return sys.version_info[:2] >= (3, 7)

setup.cfg

@@ -1,4 +1,4 @@
 [metadata]
-license_files = LICENSE
+license_files = LICENSE.md
 [aliases]
 test=pytest

setup.py

@@ -48,22 +48,22 @@ def run(self):
 
 setuptools.setup(
     name="jupyter-matlab-proxy",
-    version="0.3.2",
+    version="0.3.3",
     url="https://github.com/mathworks/jupyter-matlab-proxy",
     author="The MathWorks, Inc.",
     author_email="[email protected]",
     license="MATHWORKS CLOUD REFERENCE ARCHITECTURE LICENSE",
-    description="Jupyter extension to proxy MATLAB JavaScript Desktop",
+    description="Jupyter Server Proxy for MATLAB",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=setuptools.find_packages(exclude=["devel", "tests"]),
     keywords=["Jupyter"],
     classifiers=["Framework :: Jupyter"],
-    python_requires="~=3.7",
+    python_requires="~=3.6",
     install_requires=["jupyter-server-proxy", "aiohttp>=3.7.4"],
     setup_requires=["pytest-runner"],
     tests_require=tests_require,
-    extras_require={"dev": ["aiohttp-devtools"] + tests_require},
+    extras_require={"dev": ["aiohttp-devtools", "black"] + tests_require},
     entry_points={
         "jupyter_serverproxy_servers": ["matlab = jupyter_matlab_proxy:setup_matlab"],
         "console_scripts": ["matlab-jupyter-app = jupyter_matlab_proxy.app:main"],

tests/util/test_mwi_custom_http_headers.py

@@ -4,7 +4,6 @@
 import pytest, os, time, json, stat
 from jupyter_matlab_proxy.util import mwi_custom_http_headers
 from jupyter_matlab_proxy import mwi_environment_variables as mwi_env
-from contextlib import nullcontext as does_not_raise
 
 
 def test_get_custom_header_env_var():
@@ -30,7 +29,7 @@ def non_existent_random_json_file_fixture(tmp_path):
     Returns:
         PosixPath: of the non-existent random json file.
     """
-    random_file = tmp_path / f"{str(time.time_ns())}.json"
+    random_file = tmp_path / f'{str(time.time()).replace(".", "")}.json'
     return random_file
 
 
@@ -164,13 +163,12 @@ def test_check_file_validity_no_error(non_existent_temp_json_file, valid_json_co
     with open(random_json_file_with_valid_content, "w") as f:
         f.write(valid_json_content)
 
-    with does_not_raise():
-        assert (
-            mwi_custom_http_headers.__check_file_validity(
-                random_json_file_with_valid_content
-            )
-            is True
+    assert (
+        mwi_custom_http_headers.__check_file_validity(
+            random_json_file_with_valid_content
         )
+        is True
+    )
 
 
 def test_get_no_env_var():