Merge pull request #1 from vpython/master

Pull from master

Author: jcoady

.gitignore

@@ -28,6 +28,9 @@ var/
 
 !vpython/lib
 
+# Notebook stuff
+.ipynb_checkpoints
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

Demos/RotatingBoxes.ipynb

@@ -107,7 +107,6 @@
    "source": [
     "from vpython import *\n",
     "scene = canvas() # This is needed in Jupyter notebook and lab to make programs easily rerunnable\n",
-    "from time import clock\n",
     "\n",
     "N = 10\n",
     "\n",

Demos_no_notebook/HardSphereGas.py

@@ -1,5 +1,4 @@
 from vpython import *
-from time import clock
 
 # Hard-sphere gas.
 
@@ -48,7 +47,7 @@
 p = []
 apos = []
 pavg = sqrt(2*mass*1.5*k*T) # average kinetic energy p**2/(2mass) = (3/2)kT
-    
+
 for i in range(Natoms):
     x = L*random()-L/2
     y = L*random()-L/2
@@ -152,24 +151,24 @@ def checkCollisions():
 
     # Update all positions
     for i in range(Natoms): Atoms[i].pos = apos[i] = apos[i] + (p[i]/mass)*dt
-    
+
     # Check for collisions
     hitlist = checkCollisions()
 
-    
+
     for i in range(Natoms):
         loc = apos[i]
         if abs(loc.x) > L/2:
             if loc.x < 0: p[i].x =  abs(p[i].x)
             else: p[i].x =  -abs(p[i].x)
-        
+
         if abs(loc.y) > L/2:
             if loc.y < 0: p[i].y = abs(p[i].y)
             else: p[i].y =  -abs(p[i].y)
-        
+
         if abs(loc.z) > L/2:
             if loc.z < 0: p[i].z =  abs(p[i].z)
             else: p[i].z =  -abs(p[i].z)
-    
+
 timer = clock()-timer
 print(timer)

Demos_no_notebook/qt.py

@@ -0,0 +1,4 @@
+from vpython import *
+set_browser(type='pyqt')
+b = box()
+scene.caption = "A box should appear in the window above"

JupyterPythonDemos.zip

@@ -249,6 +249,10 @@ def onClose(self, wasClean, code, reason):
         raise RuntimeError('The pyqt browser cannot be used on Windows. '
                            'Please use the default browser instead by '
                            'removing set_browser("pyqt") from your code.')
+    elif sys.version_info.major == 3 and sys.version_info.minor >= 8:
+        raise RuntimeError('The pyqt browser cannot be used on Python 3.8. '
+                           'Please use the default browser instead by '
+                           'removing set_browser("pyqt") from your code.')
 
 
 def start_Qapp(port):

vpython/no_notebook.py

@@ -1,8 +1,8 @@
 import time
-try:
-    _clock = time.perf_counter # time.clock is deprecated in Python 3.3, gone in 3.8
-except:
-    _clock = time.clock
+
+_clock = time.perf_counter
+
+
 _tick = 1/60
 
 #import platform

vpython/rate_control.py

@@ -6,10 +6,10 @@
 from math import sqrt, tan, pi
 
 import time
-try:
-    clock = time.perf_counter # time.clock is deprecated in Python 3.3, gone in 3.8
-except:
-    clock = time.clock
+
+# vpython provides clock in its namespace
+clock = time.perf_counter
+
 import sys
 from . import __version__, __gs_version__
 from ._notebook_helpers import _isnotebook