Merge branch 'master' of ssh://rsdev/home/bmiller/Runestone/RunestoneComponents into bookserver

Author: bnmnetp

README.rst

@@ -9,9 +9,6 @@ RunestoneComponents
    :target: https://pypi.python.org/pypi/Runestone
    :alt: PyPI Monthly downloads
 
-.. image:: https://travis-ci.com/RunestoneInteractive/RunestoneComponents.svg?branch=master
-    :target: https://travis-ci.com/RunestoneInteractive/RunestoneComponents
-
 .. image:: https://github.com/RunestoneInteractive/RunestoneComponents/workflows/Python%20package/badge.svg
 
 Packaging of the Runestone components for publishing educational materials using Sphinx and restructuredText. Check out the `Overview <http://interactivepython.org/runestone/static/overview/overview.html>`_ To see all of the extensions in action.

package-lock.json

@@ -5,66 +5,62 @@
 #    pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
 #
 alabaster==0.7.12         # via sphinx
-astroid==2.4.1            # via pylint
-attrs==19.3.0             # via pytest
-babel==2.8.0              # via sphinx
-bleach==3.1.5             # via readme-renderer
-certifi==2020.4.5.1       # via requests
-cffi==1.14.0              # via cryptography
-chardet==3.0.4            # via requests
+astroid==2.4.2            # via pylint
+attrs==20.3.0             # via pytest
+babel==2.9.0              # via sphinx
+bleach==3.2.1             # via readme-renderer
+certifi==2020.12.5        # via requests
+chardet==4.0.0            # via requests
 click==7.1.2              # via -r requirements.in, pip-tools
-codechat==1.8.2           # via -r requirements.in
+codechat==1.8.3           # via -r requirements.in
 cogapp==3.0.0             # via -r requirements.in
-cryptography==2.9.2       # via secretstorage
+colorama==0.4.4           # via twine
 docutils==0.16            # via codechat, readme-renderer, sphinx
 easyprocess==0.3          # via pyvirtualdisplay
-idna==2.9                 # via requests
+idna==2.10                # via requests
 imagesize==1.2.0          # via sphinx
-isort==4.3.21             # via pylint
-jeepney==0.4.3            # via keyring, secretstorage
+iniconfig==1.1.1          # via pytest
+isort==5.6.4              # via pylint
 jinja2==2.11.2            # via sphinx
-keyring==21.2.1           # via twine
+keyring==21.5.0           # via twine
 lazy-object-proxy==1.4.3  # via astroid
-lxml==4.5.1               # via codechat
+lxml==4.6.2               # via codechat
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via pylint
-more-itertools==8.3.0     # via pytest
-packaging==20.4           # via bleach, pytest, sphinx
+packaging==20.8           # via bleach, pytest, sphinx
 paver==1.3.4              # via -r requirements.in, sphinxcontrib-paverutils
-pip-tools==5.2.0          # via -r requirements-dev.in
-pkginfo==1.5.0.1          # via twine
+pip-tools==5.4.0          # via -r requirements-dev.in
+pkginfo==1.6.1            # via twine
 pluggy==0.13.1            # via pytest
-py==1.8.1                 # via pytest
-pycparser==2.20           # via cffi
-pygments==2.6.1           # via codechat, readme-renderer, sphinx
-pylint==2.5.2             # via -r requirements-dev.in
+py==1.10.0                # via pytest
+pygments==2.7.3           # via codechat, readme-renderer, sphinx
+pylint==2.6.0             # via -r requirements-dev.in
 pyparsing==2.4.7          # via packaging
-pytest==5.4.2             # via -r requirements-dev.in
-pytz==2020.1              # via babel
-pyvirtualdisplay==1.0     # via -r requirements-dev.in
-readme-renderer==26.0     # via -r requirements-dev.in, twine
+pytest==6.2.1             # via -r requirements-dev.in
+pytz==2020.4              # via babel
+pyvirtualdisplay==1.3.2   # via -r requirements-dev.in
+readme-renderer==28.0     # via -r requirements-dev.in, twine
 requests-toolbelt==0.9.1  # via twine
-requests==2.23.0          # via requests-toolbelt, sphinx, twine
-secretstorage==3.1.2      # via keyring
+requests==2.25.1          # via requests-toolbelt, sphinx, twine
+rfc3986==1.4.0            # via twine
 selenium==3.141.0         # via -r requirements-dev.in
-six==1.15.0               # via -r requirements.in, astroid, bleach, cryptography, packaging, paver, pip-tools, readme-renderer
+six==1.15.0               # via -r requirements.in, astroid, bleach, paver, pip-tools, readme-renderer
 snowballstemmer==2.0.0    # via sphinx
-sphinx==3.0.4             # via -r requirements.in, sphinxcontrib-paverutils
+sphinx==3.3.1             # via -r requirements.in, sphinxcontrib-paverutils
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
 sphinxcontrib-htmlhelp==1.0.3  # via sphinx
 sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-paverutils==1.17.0  # via -r requirements.in
 sphinxcontrib-qthelp==1.0.3  # via sphinx
 sphinxcontrib-serializinghtml==1.1.4  # via sphinx
-sqlalchemy==1.3.17        # via -r requirements.in
-toml==0.10.1              # via pylint
-tqdm==4.46.0              # via twine
-twine==3.1.1              # via -r requirements-dev.in
-urllib3==1.25.9           # via requests, selenium
-wcwidth==0.1.9            # via pytest
+sqlalchemy==1.3.21        # via -r requirements.in
+toml==0.10.2              # via pylint, pytest
+tqdm==4.54.1              # via twine
+twine==3.2.0              # via -r requirements-dev.in
+urllib3==1.26.2           # via requests, selenium
 webencodings==0.5.1       # via bleach
-wheel==0.34.2             # via -r requirements-dev.in
+wheel==0.36.2             # via -r requirements-dev.in
 wrapt==1.12.1             # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:

requirements-dev.txt

@@ -5,36 +5,36 @@
 #    pip-compile --output-file=requirements.txt requirements.in
 #
 alabaster==0.7.12         # via sphinx
-babel==2.8.0              # via sphinx
-certifi==2020.4.5.1       # via requests
-chardet==3.0.4            # via requests
+babel==2.9.0              # via sphinx
+certifi==2020.12.5        # via requests
+chardet==4.0.0            # via requests
 click==7.1.2              # via -r requirements.in
-codechat==1.8.2           # via -r requirements.in
+codechat==1.8.3           # via -r requirements.in
 cogapp==3.0.0             # via -r requirements.in
 docutils==0.16            # via codechat, sphinx
-idna==2.9                 # via requests
+idna==2.10                # via requests
 imagesize==1.2.0          # via sphinx
 jinja2==2.11.2            # via sphinx
-lxml==4.5.1               # via codechat
+lxml==4.6.2               # via codechat
 markupsafe==1.1.1         # via jinja2
-packaging==20.4           # via sphinx
+packaging==20.8           # via sphinx
 paver==1.3.4              # via -r requirements.in, sphinxcontrib-paverutils
-pygments==2.6.1           # via codechat, sphinx
+pygments==2.7.3           # via codechat, sphinx
 pyparsing==2.4.7          # via packaging
-pytz==2020.1              # via babel
-requests==2.23.0          # via sphinx
-six==1.15.0               # via -r requirements.in, packaging, paver
+pytz==2020.4              # via babel
+requests==2.25.1          # via sphinx
+six==1.15.0               # via -r requirements.in, paver
 snowballstemmer==2.0.0    # via sphinx
-sphinx==3.0.4             # via -r requirements.in, sphinxcontrib-paverutils
+sphinx==3.3.1             # via -r requirements.in, sphinxcontrib-paverutils
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
 sphinxcontrib-htmlhelp==1.0.3  # via sphinx
 sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-paverutils==1.17.0  # via -r requirements.in
 sphinxcontrib-qthelp==1.0.3  # via sphinx
 sphinxcontrib-serializinghtml==1.1.4  # via sphinx
-sqlalchemy==1.3.17        # via -r requirements.in
-urllib3==1.25.9           # via requests
+sqlalchemy==1.3.21        # via -r requirements.in
+urllib3==1.26.2           # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements-test.txt

@@ -551,7 +551,7 @@ export class ActiveCode extends RunestoneBase {
     // add an initial load history button
     // if there is no edit then there is no append   to_save (True/False)
     async addHistoryScrubber(pos_last) {
-        let deferred = Promise.resolve();
+        let response;
         var reqData = {
             acid: this.divid,
         };
@@ -572,7 +572,7 @@ export class ActiveCode extends RunestoneBase {
                 body: JSON.stringify(reqData),
             });
             try {
-                let response = await fetch(request);
+                response = await fetch(request);
                 let data = await response.json();
                 if (data.history !== undefined) {
                     this.history = this.history.concat(data.history);
@@ -585,16 +585,9 @@ export class ActiveCode extends RunestoneBase {
             } catch (e) {
                 console.log("unable to fetch history");
             }
-            deferred = new Promise((resolve, reject) => {
-                try {
-                    this.renderScrubber(pos_last);
-                    resolve("done");
-                } catch (e) {
-                    reject(e);
-                }
-            });
+            this.renderScrubber(pos_last);
         }
-        return deferred;
+        return "success";
     }
 
     renderScrubber(pos_last) {
@@ -1142,10 +1135,7 @@ Yet another is that there is an internal error.  The internal error message is:
 
     async manage_scrubber(saveCode) {
         if (this.historyScrubber === null && !this.autorun) {
-            let response = await this.addHistoryScrubber();
-            if (!response.ok) {
-                console.log("Failed to load history -- this should not fail.");
-            }
+            await this.addHistoryScrubber();
         }
         if (
             this.historyScrubber &&

requirements.txt

@@ -10,7 +10,7 @@
 with open("requirements.txt", "r", encoding="utf-8") as fh:
     dependencies = [l.strip() for l in fh]
 
-VERSION = "5.5.3"
+VERSION = "5.5.4"
 
 # These pre-install hooks are useful to make sure any pre-requisite
 # programs that are not pip installable are in place.