Merge branch 'RunestoneInteractive:master' into master

Author: xinyinghou

.gitignore

@@ -4,6 +4,7 @@
 *.py[cod]
 *.log
 .venv
+jsdist
 
 # C extensions
 *.so

makeRelease.sh

@@ -12,23 +12,21 @@ if [ $# -eq 0 ]
 fi
 
 while true; do
-read -p "Did you update/commit the version in setup.py " yn
+read -p "Did you update/commit the version in pyproject.toml " yn
     case $yn in
         [Yy]* ) break;;
         [Nn]* ) exit;;
         * ) echo "Please answer yes or no.";;
     esac
 done
 
-rm -f dist/*
+echo "Building webpack bundle"
 npm run dist
-python setup.py sdist
-pip wheel --no-index --no-deps --global-option bdist_wheel  --wheel-dir dist dist/*.tar.gz
-
-
-twine check dist/*
-twine upload dist/*
 
+echo "building python package"
+poetry build
+poetry publish
+ 
 echo "tagging this release and pushing to github"
 
 git tag -a $1 -m 'tag new version'
@@ -44,6 +42,7 @@ if [ -d ~/.virtualenvs/json2xml ]
     cd runestone
     tar --strip-components 1 -zcf dist-$1.tgz dist/*
     scp dist-$1.tgz balance.runestoneacademy.org:~/
+    mv dist-$1.tgz ../jsdist
   else
     echo "Warning: no json2xml ve found skipping pretext"
 fi

pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Topic :: Education",
     "Topic :: Text Processing :: Markup",
 ]
@@ -33,7 +34,7 @@ license = "GPL"
 name = "runestone"
 readme = "README.rst"
 repository = "https://github.com/RunestoneInteractive/RunestoneComponents"
-version = "6.2.3dev"
+version = "6.3.0"
 
 # See https://python-poetry.org/docs/pyproject/#include-and-exclude.
 include = [

runestone/common/js/pretext.js

@@ -19,6 +19,9 @@ function setupPTXEvents() {
         let code = $(container[0]).find(".sagecell_input")[0].textContent;
         rb.logBookEvent({ event: "sage", act: "run", div_id: container[0].id });
     });
+    if (!eBookConfig.isInstructor) {
+        $(".commentary").hide();
+    }
 }
 
 window.addEventListener("load", function () {

runestone/common/js/runestonebase.js

@@ -437,6 +437,9 @@ export default class RunestoneBase {
         if (MathJax.version.substring(0, 1) === "2") {
             MathJax.Hub.Queue(["Typeset", MathJax.Hub, component]);
         } else {
+            // See - https://docs.mathjax.org/en/latest/advanced/typeset.html
+            // Per the above we should keep track of the promises and only call this
+            // a second time if all previous promises have resolved.
             MathJax.typesetPromise([component]);
         }
     }