Merge pull request #83 from rdeits/rd/drop-py27

Drop Python2.7 and require Python3.6 or above

Author: rdeits

Diff for: .travis.yml

@@ -1,9 +1,10 @@
 language: python
 
 python:
-  - "2.7"
-  - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9"
 os:
   - linux
 

Diff for: Readme.rst

@@ -23,6 +23,8 @@ The MeshCat architecture is based on the model used by Jupyter_:
 Installation
 ------------
 
+The latest version of MeshCat requires Python 3.6 or above.
+
 Using pip:
 
 ::

Diff for: setup.py

@@ -2,10 +2,10 @@
 from setuptools import setup, find_packages
 
 setup(name="meshcat",
-    version="0.0.20",
+    version="0.1.0",
     description="WebGL-based visualizer for 3D geometries and scenes",
     url="https://github.com/rdeits/meshcat-python",
-    download_url="https://github.com/rdeits/meshcat-python/archive/v0.0.20.tar.gz",
+    download_url="https://github.com/rdeits/meshcat-python/archive/v0.1.0.tar.gz",
     author="Robin Deits",
     author_email="[email protected]",
     license="MIT",
@@ -20,10 +20,10 @@
     install_requires=[
       "ipython >= 5",
       "u-msgpack-python >= 2.4.1",
-      "numpy >= 1.14.0" if sys.version_info >= (3, 0) else "numpy >= 1.14.0, < 1.17",
-      "tornado >= 4.0.0" if sys.version_info >= (3, 0) else "tornado >= 4.0.0, < 6.0",
+      "numpy >= 1.14.0",
+      "tornado >= 4.0.0",
       "pyzmq >= 17.0.0",
-      "pyngrok >= 4.1.6" if sys.version_info >= (3, 0) else "pyngrok >= 4.1.6, < 5.0.0"
+      "pyngrok >= 4.1.6",
     ],
     zip_safe=False,
     include_package_data=True

Diff for: src/meshcat/animation.py

@@ -1,12 +1,7 @@
-from __future__ import absolute_import, division, print_function
-
 import tempfile
 import tarfile
-import sys
 import os.path
 import subprocess
-if sys.version_info >= (3, 0):
-    unicode = str
 
 import bisect
 from . import transformations as tf
@@ -34,8 +29,8 @@ def set_property(self, frame, value):
 
     def lower(self):
         return {
-            u"name": unicode("." + self.name),
-            u"type": unicode(self.jstype),
+            u"name": str("." + self.name),
+            u"type": str(self.jstype),
             u"keys": [{
                 u"time": self.frames[i],
                 u"value": self.values[i]
@@ -63,7 +58,7 @@ def set_property(self, frame, property, jstype, value):
     def lower(self):
         return {
             u"fps": self.fps,
-            u"name": unicode(self.name),
+            u"name": str(self.name),
             u"tracks": [t.lower() for t in self.tracks.values()]
         }
 

Diff for: src/meshcat/commands.py

@@ -1,9 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
-import sys
-if sys.version_info >= (3, 0):
-    unicode = str
-
 from .geometry import Geometry, Object, Mesh, MeshPhongMaterial, OrthographicCamera, PointsMaterial, Points
 from .path import Path
 

Diff for: src/meshcat/geometry.py

@@ -1,17 +1,6 @@
-from __future__ import absolute_import, division, print_function
-
-import sys
 import base64
 import uuid
-
-if sys.version_info >= (3, 0):
-    unicode = str
-    from io import StringIO, BytesIO
-else:
-    from StringIO import StringIO
-    BytesIO = StringIO
-
-
+from io import StringIO, BytesIO
 import umsgpack
 import numpy as np
 
@@ -20,7 +9,7 @@
 
 class SceneElement(object):
     def __init__(self):
-        self.uuid = unicode(uuid.uuid1())
+        self.uuid = str(uuid.uuid1())
 
 
 class ReferenceSceneElement(SceneElement):
@@ -202,7 +191,7 @@ def from_file(fname):
     def lower(self, object_data):
         return {
             u"uuid": self.uuid,
-            u"url": unicode("data:image/png;base64," + base64.b64encode(self.data).decode('ascii'))
+            u"url": str("data:image/png;base64," + base64.b64encode(self.data).decode('ascii'))
         }
 
 
@@ -280,7 +269,7 @@ def __init__(self, left, right, top, bottom, near, far, zoom=1):
         self.near = near
         self.far = far
         self.zoom = zoom
-    
+
     def lower(self):
         data = {
             u"object": {
@@ -332,15 +321,12 @@ def pack_numpy_array(x):
 
 
 def data_from_stream(stream):
-    if sys.version_info >= (3, 0):
-        if isinstance(stream, BytesIO):
-            data = stream.read().decode(encoding='utf-8')
-        elif isinstance(stream, StringIO):
-            data = stream.read()
-        else:
-            raise ValueError('Stream must be instance of StringIO or BytesIO, not {}'.format(type(stream)))
-    else:
+    if isinstance(stream, BytesIO):
+        data = stream.read().decode(encoding='utf-8')
+    elif isinstance(stream, StringIO):
         data = stream.read()
+    else:
+        raise ValueError('Stream must be instance of StringIO or BytesIO, not {}'.format(type(stream)))
     return data
 
 
@@ -401,15 +387,12 @@ def from_file(fname):
 
     @staticmethod
     def from_stream(f):
-        if sys.version_info >= (3, 0):
-            if isinstance(f, BytesIO):
-                arr  = np.frombuffer(f.read(), dtype=np.uint8)
-            elif isinstance(f, StringIO):
-                arr = np.frombuffer(bytes(f.read(), "utf-8"), dtype=np.uint8)
-            else:
-                raise ValueError('Stream must be instance of StringIO or BytesIO, not {}'.format(type(f)))
-        else:
+        if isinstance(f, BytesIO):
             arr  = np.frombuffer(f.read(), dtype=np.uint8)
+        elif isinstance(f, StringIO):
+            arr = np.frombuffer(bytes(f.read(), "utf-8"), dtype=np.uint8)
+        else:
+            raise ValueError('Stream must be instance of StringIO or BytesIO, not {}'.format(type(f)))
         _, extcode = threejs_type(np.uint8)
         encoded = umsgpack.Ext(extcode, arr.tobytes())
         return MeshGeometry(encoded, u"stl")

Diff for: src/meshcat/path.py

@@ -1,10 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
-import sys
-if sys.version_info >= (3, 0):
-    unicode = str
-
-
 class Path(object):
     __slots__ = ["entries"]
 
@@ -21,7 +14,7 @@ def append(self, other):
         return Path(new_path)
 
     def lower(self):
-        return unicode("/" + "/".join(self.entries))
+        return "/" + "/".join(self.entries)
 
     def __hash__(self):
         return hash(self.entries)

Diff for: src/meshcat/servers/zmqserver.py

@@ -8,12 +8,6 @@
 import subprocess
 import multiprocessing
 
-if sys.version_info >= (3, 0):
-    ADDRESS_IN_USE_ERROR = OSError
-else:
-    import socket
-    ADDRESS_IN_USE_ERROR = socket.error
-
 import tornado.web
 import tornado.ioloop
 import tornado.websocket
@@ -43,7 +37,7 @@ def start_zmq_server_as_subprocess(zmq_url=None, server_args=[]):
     """
     Starts the ZMQ server as a subprocess, passing *args through popen.
     Optional Keyword Arguments:
-        zmq_url  
+        zmq_url
     """
     # Need -u for unbuffered output: https://stackoverflow.com/a/25572491
     args = [sys.executable, "-u", "-m", "meshcat.servers.zmqserver"]
@@ -58,16 +52,13 @@ def start_zmq_server_as_subprocess(zmq_url=None, server_args=[]):
     # e.g. on Windows SYSTEMROOT and PATH
     env = dict(os.environ)
     env["PYTHONPATH"] = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-    kwargs = {
-        'stdout': subprocess.PIPE,
-        'stderr': subprocess.PIPE,
-        'env': env
-    }
     # Use start_new_session if it's available. Without it, in jupyter the server
     # goes down when we cancel execution of any cell in the notebook.
-    if sys.version_info.major >= 3:
-        kwargs['start_new_session'] = True
-    server_proc = subprocess.Popen(args, **kwargs)
+    server_proc = subprocess.Popen(args,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        env=env,
+        start_new_session=True)
     line = ""
     while "zmq_url" not in line:
         line = server_proc.stdout.readline().strip().decode("utf-8")
@@ -117,7 +108,7 @@ def find_available_port(func, default_port, max_attempts=MAX_ATTEMPTS, **kwargs)
         port = default_port + i
         try:
             return func(port, **kwargs), port
-        except (ADDRESS_IN_USE_ERROR, zmq.error.ZMQError):
+        except (OSError, zmq.error.ZMQError):
             print("Port: {:d} in use, trying another...".format(port), file=sys.stderr)
         except Exception as e:
             print(type(e))
@@ -166,7 +157,7 @@ def set_extra_headers(self, path):
 class ZMQWebSocketBridge(object):
     context = zmq.Context()
 
-    def __init__(self, zmq_url=None, host="127.0.0.1", port=None,              
+    def __init__(self, zmq_url=None, host="127.0.0.1", port=None,
                  certfile=None, keyfile=None, ngrok_http_tunnel=False):
         self.host = host
         self.websocket_pool = set()
@@ -214,19 +205,14 @@ def f(port):
                 import pyngrok.conf
                 import pyngrok.ngrok
 
-                kwargs = {}
                 # Use start_new_session if it's available. Without it, in
                 # jupyter the server goes down when we cancel execution of any
                 # cell in the notebook.
-                if sys.version_info.major >= 3:
-                        kwargs['start_new_session'] = True
-                config = pyngrok.conf.PyngrokConfig(**kwargs)
+                config = pyngrok.conf.PyngrokConfig(start_new_session=True)
                 self.web_url = pyngrok.ngrok.connect(self.fileserver_port, "http", pyngrok_config=config)
 
                 # pyngrok >= 5.0.0 returns an NgrokTunnel object instead of the string.
-                if sys.version_info.major < 3:
-                    self.web_url = self.web_url.decode("utf-8")
-                elif not isinstance(self.web_url, str):
+                if not isinstance(self.web_url, str):
                     self.web_url = self.web_url.public_url
                 self.web_url += "/static/"
 
@@ -267,8 +253,8 @@ def handle_zmq(self, frames):
             path = list(filter(lambda x: len(x) > 0, frames[1].decode("utf-8").split("/")))
             data = frames[2]
             # Support caching of objects (note: even UUIDs have to match).
-            cache_hit = (cmd == "set_object" and 
-                         find_node(self.tree, path).object and 
+            cache_hit = (cmd == "set_object" and
+                         find_node(self.tree, path).object and
                          find_node(self.tree, path).object == data)
             if not cache_hit:
                 self.forward_to_websockets(frames)
@@ -379,8 +365,8 @@ def main():
     parser.add_argument('--open', '-o', action="store_true")
     parser.add_argument('--certfile', type=str, default=None)
     parser.add_argument('--keyfile', type=str, default=None)
-    parser.add_argument('--ngrok_http_tunnel', action="store_true", help="""    
-ngrok is a service for creating a public URL from your local machine, which 
+    parser.add_argument('--ngrok_http_tunnel', action="store_true", help="""
+ngrok is a service for creating a public URL from your local machine, which
 is very useful if you would like to make your meshcat server public.""")
     results = parser.parse_args()
     bridge = ZMQWebSocketBridge(zmq_url=results.zmq_url,

Diff for: src/meshcat/tests/test_drawing.py

@@ -1,16 +1,10 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 import subprocess
 import sys
 import tempfile
 import os
 
-if sys.version_info >= (3, 0):
-    from io import StringIO, BytesIO
-else:
-    from StringIO import StringIO
-    BytesIO = StringIO
+from io import StringIO, BytesIO
 
 import io
 

Diff for: src/meshcat/tests/test_ports.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 import os
 import subprocess
@@ -11,7 +9,7 @@
 
 class TestPortScan(unittest.TestCase):
     """
-    Test that the ZMQ server can correctly handle its default ports 
+    Test that the ZMQ server can correctly handle its default ports
     already being in use.
     """
 

Diff for: src/meshcat/tests/test_start_server.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import unittest
 
 from meshcat.servers.zmqserver import start_zmq_server_as_subprocess

Diff for: src/meshcat/transformations.py

@@ -193,8 +193,6 @@
 
 """
 
-from __future__ import absolute_import, division, print_function
-
 import math
 
 import numpy

Diff for: src/meshcat/visualizer.py

@@ -1,8 +1,4 @@
-from __future__ import absolute_import, division, print_function
-
-import sys
 import webbrowser
-
 import umsgpack
 import numpy as np
 import zmq