MNT make parameter optional if matplotlib < 3.4

Author: TomDLT

tutorials/notebooks/shortclips/00_setup_colab.ipynb

@@ -51,7 +51,7 @@
       },
       "outputs": [],
       "source": [
-        "# !pip install -U --no-cache-dir gdown --pre\n# ![ -f \"vim-5-for-ccn.tar.gz\" ] || gdown --id 1b0I0Ytj06m6GCmfxfNrZuyF97fDo3NZb\n# ![ -d \"vim-5\" ] || tar xzf vim-5-for-ccn.tar.gz\n# !ln -s vim-5 shortclips\n# !apt-get install -qq inkscape > /dev/null\n# !pip install -q voxelwise_tutorials==0.1.2\n# ![ -f \"ngrok-stable-linux-amd64.zip\" ] || wget -q https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip\n# ![ -f \"ngrok\" ] || unzip ngrok-stable-linux-amd64.zip"
+        "# !pip install -U --no-cache-dir gdown --pre\n# ![ -f \"vim-5-for-ccn.tar.gz\" ] || gdown --id 1b0I0Ytj06m6GCmfxfNrZuyF97fDo3NZb\n# ![ -d \"vim-5\" ] || tar xzf vim-5-for-ccn.tar.gz\n# !ln -s vim-5 shortclips\n# !apt-get install -qq inkscape > /dev/null\n# !pip install -q voxelwise_tutorials==0.1.3\n# ![ -f \"ngrok-stable-linux-amd64.zip\" ] || wget -q https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip\n# ![ -f \"ngrok\" ] || unzip ngrok-stable-linux-amd64.zip"
       ]
     },
     {

tutorials/notebooks/shortclips/merged_for_colab.ipynb

@@ -78,7 +78,7 @@
     "# ![ -d \"vim-5\" ] || tar xzf vim-5-for-ccn.tar.gz\n",
     "# !ln -s vim-5 shortclips\n",
     "# !apt-get install -qq inkscape > /dev/null\n",
-    "# !pip install -q voxelwise_tutorials==0.1.2\n",
+    "# !pip install -q voxelwise_tutorials==0.1.3\n",
     "# ![ -f \"ngrok-stable-linux-amd64.zip\" ] || wget -q https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip\n",
     "# ![ -f \"ngrok\" ] || unzip ngrok-stable-linux-amd64.zip"
    ]

tutorials/shortclips/00_setup_colab.py

@@ -30,7 +30,7 @@
 # ![ -d "vim-5" ] || tar xzf vim-5-for-ccn.tar.gz
 # !ln -s vim-5 shortclips
 # !apt-get install -qq inkscape > /dev/null
-# !pip install -q voxelwise_tutorials==0.1.2
+# !pip install -q voxelwise_tutorials==0.1.3
 # ![ -f "ngrok-stable-linux-amd64.zip" ] || wget -q https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip
 # ![ -f "ngrok" ] || unzip ngrok-stable-linux-amd64.zip
 

voxelwise_tutorials/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.2'
+__version__ = '0.1.3'

voxelwise_tutorials/regression_toy.py

@@ -82,11 +82,16 @@ def plot_2d(X, y, w, flat=True, alpha=None, show_noiseless=True):
 
     fig = plt.figure(figsize=(6.7, 2.5))
 
+    #####################
     # left plot: y = f(x)
-    ax = fig.add_subplot(121, projection='3d', computed_zorder=False)
+
+    try:  # computed_zorder is only available in matplotlib >= 3.4
+        ax = fig.add_subplot(121, projection='3d', computed_zorder=False)
+    except AttributeError:
+        ax = fig.add_subplot(121, projection='3d')
 
     # to help matplotlib displays scatter points behind any surface, we
-    # first plot the point below, then the surface, then the ponts above,
+    # first plot the point below, then the surface, then the points above,
     # and use computed_zorder=False.
     above = y > X @ w
     ax.scatter3D(X[~above, 0], X[~above, 1], y[~above], alpha=0.5, color="C0")
@@ -103,6 +108,7 @@ def plot_2d(X, y, w, flat=True, alpha=None, show_noiseless=True):
     ax.set(xlabel="X[:, 0]", ylabel="X[:, 1]", zlabel="y",
            zlim=[yy.min(), yy.max()])
 
+    #########################
     # right plot: loss = f(w)
     if flat:
         ax = fig.add_subplot(122)