Merge branch 'master' into brython-update

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 ChromeDriver executable is in your ``PATH`` environment variable. e.g. ``PATH=$PATH:path/to/chromedriver`` at your command line (or edit your ``.bash_profile``).
+* 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.
 
 * 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,23 @@
+# ************************************************
+# |docname| - Configuration for a CodeChat project
+# ************************************************
+# This file defines the configuration for a CodeChat project. In addition to allowing standard JSON objects, it also allows Python-style comments and any valid Python literal.
+#
+# The file must contain a single dict, with the following keys:
+{
+    # ``source_path``: optional; defaults to ``.``. A path to the root of the source tree. Relative paths are rooted in the directory containing this 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 file.
+    "output_path": "build/RunestoneComponents",
+
+    # ``args``: required. A list of arguments to invoke the renderer. Each element of the list must be a string. Each string 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",
+}

index.rst

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

requirements-dev.txt

@@ -6,7 +6,7 @@
 #
 alabaster==0.7.12
     # via sphinx
-astroid==2.6.5
+astroid==2.5.6
     # via pylint
 atomicwrites==1.4.0
     # via pytest
@@ -16,17 +16,17 @@ attrs==21.2.0
     #   pytest
 babel==2.9.1
     # via sphinx
-bleach==3.3.1
+bleach==3.3.0
     # via readme-renderer
-certifi==2021.5.30
+certifi==2020.12.5
     # via requests
-charset-normalizer==2.0.3
+chardet==4.0.0
     # via requests
 click==7.1.2
     # via
     #   -r requirements.in
     #   pip-tools
-codechat==1.8.8
+codechat==1.8.6
     # via -r requirements.in
 cogapp==3.0.0
     # via -r requirements.in
@@ -45,19 +45,19 @@ docutils==0.16
     #   sphinx
 easyprocess==0.3
     # via pyvirtualdisplay
-greenlet==1.1.0
+greenlet==1.0.0
     # via sqlalchemy
-idna==3.2
+idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
-importlib-metadata==4.6.1
+importlib-metadata==4.0.1
     # via
     #   keyring
     #   twine
 iniconfig==1.1.1
     # via pytest
-isort==5.9.3
+isort==5.8.0
     # via pylint
 jinja2==3.0.1
     # via
@@ -90,30 +90,30 @@ paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pep517==0.11.0
+pep517==0.10.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.1.0
     # via -r requirements-dev.in
-pkginfo==1.7.1
+pkginfo==1.7.0
     # via twine
 pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
-pygments==2.9.0
+pygments==2.8.1
     # via
     #   codechat
     #   readme-renderer
     #   sphinx
-pylint==2.9.6
+pylint==2.8.2
     # via -r requirements-dev.in
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.4
+pytest==6.2.3
     # via -r requirements-dev.in
 pytz==2021.1
     # via babel
-pyvirtualdisplay==2.2
+pyvirtualdisplay==2.1
     # via -r requirements-dev.in
 pywin32-ctypes==0.2.0
     # via keyring
@@ -134,7 +134,7 @@ rfc3986==1.5.0
     # via twine
 selenium==3.141.0
     # via -r requirements-dev.in
-six==1.16.0
+six==1.15.0
     # via
     #   -r requirements.in
     #   bleach
@@ -151,41 +151,38 @@ sphinxcontrib-applehelp==1.0.2
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+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.5
+sphinxcontrib-serializinghtml==1.1.4
     # via sphinx
-sqlalchemy==1.4.22
+sqlalchemy==1.4.12
     # via -r requirements.in
 toml==0.10.2
     # via
+    #   pep517
     #   pylint
     #   pytest
-tomli==1.2.0
-    # via pep517
-tqdm==4.61.2
+tqdm==4.60.0
     # via twine
-twine==3.4.2
+twine==3.4.1
     # via -r requirements-dev.in
-urllib3==1.26.6
+urllib3==1.26.4
     # via
     #   requests
     #   selenium
 webencodings==0.5.1
     # via bleach
 wheel==0.36.2
-    # via
-    #   -r requirements-dev.in
-    #   pip-tools
+    # via -r requirements-dev.in
 wrapt==1.12.1
     # via astroid
-zipp==3.5.0
+zipp==3.4.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements.in

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

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --output-file=requirements.txt requirements.in
@@ -8,49 +8,49 @@ alabaster==0.7.12
     # via sphinx
 babel==2.9.1
     # via sphinx
-certifi==2021.5.30
+certifi==2020.12.5
     # via requests
-charset-normalizer==2.0.3
+chardet==4.0.0
     # via requests
 click<8.0
     # via -r requirements.in
-codechat==1.8.8
+codechat==1.8.6
     # via -r requirements.in
 cogapp==3.0.0
     # via -r requirements.in
 docutils==0.16
     # via
     #   codechat
     #   sphinx
-greenlet==1.1.0
+greenlet==1.0.0
     # via sqlalchemy
-idna==3.2
+idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
-jinja2==3.0.1
+jinja2==2.11.3
     # via sphinx
 lxml==4.6.3
     # via codechat
-markupsafe==2.0.1
+markupsafe==1.1.1
     # via jinja2
-packaging==21.0
+packaging==20.9
     # via sphinx
 paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pygments==2.9.0
+pygments==2.8.1
     # via
     #   codechat
     #   sphinx
 pyparsing==2.4.7
     # via packaging
 pytz==2021.1
     # via babel
-requests==2.26.0
+requests==2.25.1
     # via sphinx
-six==1.16.0
+six==1.15.0
     # via
     #   -r requirements.in
     #   paver
@@ -64,19 +64,19 @@ sphinxcontrib-applehelp==1.0.2
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+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.5
+sphinxcontrib-serializinghtml==1.1.4
     # via sphinx
-sqlalchemy==1.4.22
+sqlalchemy==1.4.12
     # via -r requirements.in
-urllib3==1.26.6
+urllib3==1.26.4
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

runestone/__init__.py

@@ -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 = []
+    module_static_css = [os.path.join(basedir, "common", "css", "sphinx")]
     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,12 +145,7 @@ def setup(app):
         print("No custom CSS files")
     try:
         for c in setup.custom_js_files:
-            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)
+            app.add_js_file(c)
         print("Adding custom Javascript")
     except AttributeError:
         print("No custom js files")
@@ -230,6 +225,8 @@ 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/activecode/js/activecode.js

@@ -133,7 +133,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.
-            $(this.runButtonHandler.bind(this));
+            $(document).ready(this.runButtonHandler.bind(this));
         }
         this.indicate_component_ready();
     }

runestone/activecode/js/activecode_brython.js

@@ -134,4 +134,4 @@ document <= html.SCRIPT("let container = document.querySelector('.container-pre'
     enableSaveLoad() {
         $(this.runButton).text($.i18n("msg_activecode_render"));
     }
-}
+}