Merge branch 'master' into peer_support

Author: bnmnetp

README.rst

@@ -162,7 +162,7 @@ Our goal is to have unit tests which rely on Selenium (a library that helps simu
 
 **To run tests:**
 
-* Make sure the directory containing the PhantomJS executable is in your ``PATH`` environment variable. e.g. ``PATH=$PATH:path/to/virtualenv/directory/where/it/is/here`` at your command line (or edit your ``.bash_profile``). It should live in the site-packages/selenium/webdriver/ directory of your virtualenv.
+* Make sure the directory containing the ChromeDriver executable is in your ``PATH`` environment variable. e.g. ``PATH=$PATH:path/to/chromedriver`` at your command line (or edit your ``.bash_profile``).
 
 * Check out the existing tests, e.g. the ``test_question.py`` file that tests the Question directive, which you can find at the path ``/runestone/question/test/test_question.py``, for an example.
 

codechat_config.json

@@ -0,0 +1,39 @@
+# .. Copyright (C) 2012-2020 Bryan A. Jones.
+#
+#  This file is part of the CodeChat System.
+#
+#  The CodeChat System is free software: you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation, either version 3 of the
+#  License, or (at your option) any later version.
+#
+#  The CodeChat System is distributed in the hope that it will be
+#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with the CodeChat System.  If not, see
+#  <http://www.gnu.org/licenses/>.
+#
+# ************************************************
+# |docname| - Configuration for a CodeChat project
+# ************************************************
+# This file defines the configuration for a CodeChat project. It contains a working `Sphinx <https://www.sphinx-doc.org/>`_ configuration.
+#
+# ``source_path``: optional; defaults to ``.`` (the current directory). A path to the root of the source tree. Relative paths are rooted in the directory containing this configuration file.
+source_path: .
+
+# ``output_path``: required. A path to the root of the HTML output produced by this renderer. Relative paths are rooted in the directory containing this configuration file.
+output_path: build/RunestoneComponents
+
+# ``args``: required string or sequence of strings. This provides the arguments to invoke the renderer. These strings may optionally contain the following replacement values:
+#
+# - ``{project_path}``: an absolute path to the directory containing this file.
+# - ``{source_path}``: the ``source_path`` above, but as an absolute path.
+# - ``{output_path}``: the ``output_path`` above, but as an absolute path.
+#
+args: runestone build
+
+# ``html_ext``: optional; defaults to ``.html``. The extension used by this renderer when generating HTML files.
+#html_ext: .html

codechat_config.yaml

@@ -46,7 +46,7 @@ Misc
     .gitignore
     .readthedocs.yml
     conf.py
-    codechat_config.json
+    codechat_config.yaml
     requirements-dev.in
     requirements.in
     webpack.config.js

index.rst

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
@@ -28,7 +28,7 @@ cogapp==3.0.0
     # via -r requirements.in
 colorama==0.4.4
     # via twine
-docutils==0.17.1
+docutils==0.16
     # via
     #   codechat
     #   readme-renderer
@@ -47,7 +47,7 @@ importlib-metadata==4.6.1
     #   twine
 iniconfig==1.1.1
     # via pytest
-isort==5.9.2
+isort==5.9.3
     # via pylint
 jinja2==3.0.1
     # via sphinx
@@ -85,7 +85,7 @@ pygments==2.9.0
     #   codechat
     #   readme-renderer
     #   sphinx
-pylint==2.9.5
+pylint==2.9.6
     # via -r requirements-dev.in
 pyparsing==2.4.7
     # via packaging
@@ -99,13 +99,13 @@ readme-renderer==29.0
     # via
     #   -r requirements-dev.in
     #   twine
-requests-toolbelt==0.9.1
-    # via twine
 requests==2.26.0
     # via
     #   requests-toolbelt
     #   sphinx
     #   twine
+requests-toolbelt==0.9.1
+    # via twine
 rfc3986==1.5.0
     # via twine
 selenium==3.141.0
@@ -118,7 +118,7 @@ six==1.16.0
     #   readme-renderer
 snowballstemmer==2.1.0
     # via sphinx
-sphinx==4.1.2
+sphinx==3.5.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
@@ -142,7 +142,7 @@ toml==0.10.2
     # via
     #   pylint
     #   pytest
-tomli==1.1.0
+tomli==1.2.0
     # via pep517
 tqdm==4.61.2
     # via twine

requirements-dev.txt

@@ -4,7 +4,7 @@
 click
 Paver>=1.2.4
 six>1.12
-Sphinx>=2.0.0
+Sphinx<4.0.0
 sphinxcontrib-paverutils>=1.17
 cogapp>=2.5
 SQLAlchemy>=1.4.0

requirements.in

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    pip-compile --output-file=requirements.txt requirements.in
@@ -18,7 +18,7 @@ codechat==1.8.8
     # via -r requirements.in
 cogapp==3.0.0
     # via -r requirements.in
-docutils==0.17.1
+docutils==0.16
     # via
     #   codechat
     #   sphinx
@@ -56,7 +56,7 @@ six==1.16.0
     #   paver
 snowballstemmer==2.1.0
     # via sphinx
-sphinx==4.1.2
+sphinx==3.5.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils

requirements.txt

@@ -48,7 +48,7 @@ def runestone_static_dirs():
     module_static_js.append(os.path.join(basedir, "codelens", "js"))
     module_static_js.append(os.path.join(basedir, "webgldemo", "js"))
     module_static_js.append(os.path.join(basedir, "matrixeq", "js"))
-    module_static_css = [os.path.join(basedir, "common", "css", "sphinx")]
+    module_static_css = []
     module_static_css.append(os.path.join(basedir, "accessibility", "css"))
     module_static_css.append(os.path.join(basedir, "webgldemo", "css"))
     module_static_css.append(os.path.join(basedir, "matrixeq", "css"))
@@ -145,7 +145,12 @@ def setup(app):
         print("No custom CSS files")
     try:
         for c in setup.custom_js_files:
-            app.add_js_file(c)
+            if isinstance(c, dict):
+                #peel off filename, pass rest of key/values on as kwargs
+                filename = c.pop("file") 
+                app.add_autoversioned_javascript(filename, **c)
+            else:
+                app.add_autoversioned_javascript(c)
         print("Adding custom Javascript")
     except AttributeError:
         print("No custom js files")
@@ -225,8 +230,6 @@ def build(options):
 css_files = [
     # Generated from a template, so it can't be directly included in the webpack.
     "bootstrap-sphinx.css",
-    # Deliberately excluded, so it can be overridden by a user-supplied CSs file.
-    "theme-overrides.css",
 ]
 
 

runestone/__init__.py

@@ -132,7 +132,7 @@ export class ActiveCode extends RunestoneBase {
         );
         if (this.autorun) {
             // Simulate pressing the run button, since this will also prevent the user from clicking it until the initial run is complete, and also help the user understand why they're waiting.
-            $(document).ready(this.runButtonHandler.bind(this));
+            $(this.runButtonHandler.bind(this));
         }
         this.indicate_component_ready();
     }

runestone/activecode/js/activecode.js

@@ -40,15 +40,13 @@ export default class SQLActiveCode extends ActiveCode {
                 } else {
                     if (allDburls[self.dburl].status == "loading") {
                         allDburls[self.dburl].xWaitFor.done(function () {
-                            self.db = new SQL.Database(
-                                allDburls[self.dburl].db
-                            );
+                            self.db = allDburls[self.dburl].dbObject;
                             $(self.runButton).removeAttr("disabled");
                             $(self.runButton).text(buttonText);
                         });
                         return;
                     }
-                    self.db = new SQL.Database(allDburls[self.dburl].db);
+                    self.db = allDburls[self.dburl].dbObject;
                     $(self.runButton).removeAttr("disabled");
                     $(self.runButton).text(buttonText);
                     return;
@@ -60,6 +58,7 @@ export default class SQLActiveCode extends ActiveCode {
                 xhr.onload = (e) => {
                     var uInt8Array = new Uint8Array(xhr.response);
                     self.db = new SQL.Database(uInt8Array);
+                    allDburls[self.dburl].dbObject = self.db;
                     $(self.runButton).text(buttonText);
                     $(self.runButton).removeAttr("disabled");
                     allDburls[self.dburl].db = uInt8Array;