Merge pull request #46 from mwcraig/fix-notebook

Fix 7.6.0 for jupyter notebook

Author: mwcraig

.travis.yml

@@ -15,7 +15,8 @@ env:
         - TWINE_USERNAME="mwcraig"
     matrix:
         - CONDA_PY=3.6
-        - CONDA_PY=3.7.3  # 3.7.4 on conda is broken
+        - CONDA_PY=3.7
+        - CONDA_PY=3.8
 
 install:
     # Install and set up miniconda.
@@ -35,7 +36,7 @@ install:
 
     # Install a couple of dependencies we need for sure.
     # Not sure why cython is necessary since it is listed as a build dependency.
-    - conda install --quiet jinja2 conda-build=3.18.9 anaconda-client cython twine pytest
+    - conda install --quiet jinja2 conda-build anaconda-client cython twine pytest
 
     # make a wheel building environment to ensure correct python version.
     - conda create --quiet -n wheel-build python=$CONDA_PY wheel cython

appveyor.yml

@@ -24,6 +24,9 @@ environment:
     # python version. Right now conda build does not configure the SDK, and
     # the appveyor setup only sets up the SDK once, so separate by python
     # versions.
+    - TARGET_ARCH: "x64"
+      CONDA_PY: "3.8"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
     - TARGET_ARCH: "x64"
       CONDA_PY: "3.7"
       CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
@@ -32,6 +35,9 @@ environment:
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
 
     # 32-bit builds
+    - TARGET_ARCH: "x86"
+      CONDA_PY: "3.8"
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37"
     - TARGET_ARCH: "x86"
       CONDA_PY: "3.7"
       CONDA_INSTALL_LOCN: "C:\\Miniconda37"
@@ -64,14 +70,11 @@ install:
     - cmd: conda config --append channels conda-forge
 
     - cmd: conda config --set always_yes true
-    # - conda install conda=4.5
-    # - cmd: conda update --quiet conda python
+
 
     - echo %CONDA_PY%
     - conda update --quiet conda
-    # Need to do this to pick up newer versions of conda
-    - if "%CONDA_PY%"=="3.5" conda update --quiet conda
-
+    - if "%CONDA_PY%"=="3.8" conda install python=3.8
     - cmd: conda install --quiet conda%CONDA_VERSION_PIN% jinja2 conda-build anaconda-client cython wheel %INSTALL_ON_WINDOWS% tqdm%TQDM_PIN%
 
     #- conda create --quiet -n wheel-build python=%CONDA_PY% wheel cython

vpython/vpython_libraries/glowcomm.js

@@ -443,7 +443,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
               'p':'left', 'q':'right', 'r':'top', 's':'bottom', 't':'_cloneid',
               'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius', 
               'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
-              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':integrate_selected}
+              'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'integrate_selected'}
 
 // methods are X in {'m': '23X....'}
 var methods = {'a':'select', 'b':'pos', 'c':'start', 'd':'stop', 'f':'clear', // unused eghijklmnopvxyzCDFAB