[0.4.0] release.

Author: junhuanchen

MANIFEST.in

@@ -1 +1 @@
-include readme.md
+include README.md

readme.md README.md

@@ -11,7 +11,7 @@
 - pip install rpyc_ikernel
 - python -m rpyc_ikernel.install
 
-![index.png](./images/index.png)
+![index.png](./tests/images/index.png)
 
 ## Kernel introduction
 
@@ -80,7 +80,7 @@ pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple rpyc_ikernel && python3
 
 After the above package is installed, enter `jupyter notebook` to start the service. After startup, the system default browser will be opened automatically (recommended foreign Google browser or domestic 360 speed browser), please select the kernel of rpyc and create a new (new) designation The code file of the kernel.
 
-![kernels.png](./images/kernels.png)
+![kernels.png](./tests/images/kernels.png)
 
 If you don't see it, you can enter `python3 -m rpyc_ikernel.install` to complete the kernel installation, and you can see it now.
 

rpyc_ikernel/kernel.py

@@ -21,7 +21,6 @@
 import socket
 
 from PIL import Image # , UnidentifiedImageError
-import requests
 import rpyc
 
 try:
@@ -194,67 +193,68 @@ def iter_content(self):
             yield self.read_mjpeg_frame(self.stream, self.boundary)
 
 
-class MjpgReader():
-    """
-    MJPEG format
-
-    Content-Type: multipart/x-mixed-replace; boundary=--BoundaryString
-    --BoundaryString
-    Content-type: image/jpg
-    Content-Length: 12390
-
-    ... image-data here ...
-
-
-    --BoundaryString
-    Content-type: image/jpg
-    Content-Length: 12390
-
-    ... image-data here ...
-    """
-
-    def __init__(self, url: str):
-        self._url = url
-        self.session = requests.Session()
-
-    def iter_content(self):
-        """
-        Raises:
-            RuntimeError
-        """
-
-        r = self.session.get(self._url, stream=True, timeout=3)
-        # r = requests.get(self._url, stream=True, timeout=3)
-
-        # parse boundary
-        content_type = r.headers['content-type']
-        index = content_type.rfind("boundary=")
-        assert index != 1
-        boundary = content_type[index+len("boundary="):] + "\r\n"
-        boundary = boundary.encode('utf-8')
-
-        rd = io.BufferedReader(r.raw)
-        while True:
-            self._skip_to_boundary(rd, boundary)
-            length = self._parse_length(rd)
-            yield rd.read(length)
-
-    def _parse_length(self, rd) -> int:
-        length = 0
-        while True:
-            line = rd.readline()
-            if line == b'\r\n':
-                return length
-            if line.startswith(b"Content-Length"):
-                length = int(line.decode('utf-8').split(": ")[1])
-                assert length > 0
-
-    def _skip_to_boundary(self, rd, boundary: bytes):
-        for _ in range(10):
-            if boundary in rd.readline():
-                break
-        else:
-            raise RuntimeError("Boundary not detected:", boundary)
+# import requests
+# class MjpgReader():
+#     """
+#     MJPEG format
+
+#     Content-Type: multipart/x-mixed-replace; boundary=--BoundaryString
+#     --BoundaryString
+#     Content-type: image/jpg
+#     Content-Length: 12390
+
+#     ... image-data here ...
+
+
+#     --BoundaryString
+#     Content-type: image/jpg
+#     Content-Length: 12390
+
+#     ... image-data here ...
+#     """
+
+#     def __init__(self, url: str):
+#         self._url = url
+#         self.session = requests.Session()
+
+#     def iter_content(self):
+#         """
+#         Raises:
+#             RuntimeError
+#         """
+
+#         r = self.session.get(self._url, stream=True, timeout=3)
+#         # r = requests.get(self._url, stream=True, timeout=3)
+
+#         # parse boundary
+#         content_type = r.headers['content-type']
+#         index = content_type.rfind("boundary=")
+#         assert index != 1
+#         boundary = content_type[index+len("boundary="):] + "\r\n"
+#         boundary = boundary.encode('utf-8')
+
+#         rd = io.BufferedReader(r.raw)
+#         while True:
+#             self._skip_to_boundary(rd, boundary)
+#             length = self._parse_length(rd)
+#             yield rd.read(length)
+
+#     def _parse_length(self, rd) -> int:
+#         length = 0
+#         while True:
+#             line = rd.readline()
+#             if line == b'\r\n':
+#                 return length
+#             if line.startswith(b"Content-Length"):
+#                 length = int(line.decode('utf-8').split(": ")[1])
+#                 assert length > 0
+
+#     def _skip_to_boundary(self, rd, boundary: bytes):
+#         for _ in range(10):
+#             if boundary in rd.readline():
+#                 break
+#         else:
+#             raise RuntimeError("Boundary not detected:", boundary)
 
 ########################################################################################################################################
 

setup.py

@@ -11,9 +11,9 @@
 
 setup(
     name="rpyc_ikernel",
-    version="0.3.8",
+    version="0.4.0",
     description="rpyc for jupyter kernel",
-    long_description=open('readme.md', 'r', encoding='UTF-8').read(),
+    long_description=open('README.md', 'r', encoding='UTF-8').read(),
     long_description_content_type='text/markdown',
     author="Juwan",
     author_email="[email protected]",
@@ -22,7 +22,7 @@
     packages=["rpyc_ikernel"],
     # scripts=scripts,
     # entry_points={"console_scripts": ["rpyc_ikernel = rpyc_ikernel.__main__:main"]},
-    install_requires=["notebook", "pexpect", "rpyc", "pillow", "requests"],
+    install_requires=["notebook", "pexpect", "rpyc", "pillow"],
     tests_requires=["pytest", "scripttest"],
     include_package_data=True,
     classifiers=[