Merge branch 'master' into master

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,28 +1,28 @@
 #
-# 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
 #
 alabaster==0.7.12
     # via sphinx
-astroid==2.5.6
+astroid==2.6.5
     # via pylint
-attrs==20.3.0
+attrs==21.2.0
     # via pytest
 babel==2.9.1
     # via sphinx
-bleach==3.3.0
+bleach==3.3.1
     # via readme-renderer
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
-chardet==4.0.0
+charset-normalizer==2.0.3
     # via requests
-click==7.1.2
+click==8.0.1
     # via
     #   -r requirements.in
     #   pip-tools
-codechat==1.8.6
+codechat==1.8.8
     # via -r requirements.in
 cogapp==3.0.0
     # via -r requirements.in
@@ -35,33 +35,33 @@ docutils==0.16
     #   sphinx
 easyprocess==0.3
     # via pyvirtualdisplay
-greenlet==1.0.0
+greenlet==1.1.0
     # via sqlalchemy
-idna==2.10
+idna==3.2
     # via requests
 imagesize==1.2.0
     # via sphinx
-importlib-metadata==4.0.1
+importlib-metadata==4.6.1
     # via
     #   keyring
     #   twine
 iniconfig==1.1.1
     # via pytest
-isort==5.8.0
+isort==5.9.3
     # via pylint
-jinja2==2.11.3
+jinja2==3.0.1
     # via sphinx
 keyring==23.0.1
     # via twine
 lazy-object-proxy==1.6.0
     # via astroid
 lxml==4.6.3
     # via codechat
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via jinja2
 mccabe==0.6.1
     # via pylint
-packaging==20.9
+packaging==21.0
     # via
     #   bleach
     #   pytest
@@ -70,47 +70,47 @@ paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pep517==0.10.0
+pep517==0.11.0
     # via pip-tools
-pip-tools==6.1.0
+pip-tools==6.2.0
     # via -r requirements-dev.in
-pkginfo==1.7.0
+pkginfo==1.7.1
     # via twine
 pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
-pygments==2.8.1
+pygments==2.9.0
     # via
     #   codechat
     #   readme-renderer
     #   sphinx
-pylint==2.8.2
+pylint==2.9.6
     # via -r requirements-dev.in
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.3
+pytest==6.2.4
     # via -r requirements-dev.in
 pytz==2021.1
     # via babel
-pyvirtualdisplay==2.1
+pyvirtualdisplay==2.2
     # via -r requirements-dev.in
 readme-renderer==29.0
     # via
     #   -r requirements-dev.in
     #   twine
-requests-toolbelt==0.9.1
-    # via twine
-requests==2.25.1
+requests==2.26.0
     # via
     #   requests-toolbelt
     #   sphinx
     #   twine
-rfc3986==1.4.0
+requests-toolbelt==0.9.1
+    # via twine
+rfc3986==1.5.0
     # via twine
 selenium==3.141.0
     # via -r requirements-dev.in
-six==1.15.0
+six==1.16.0
     # via
     #   -r requirements.in
     #   bleach
@@ -126,38 +126,41 @@ sphinxcontrib-applehelp==1.0.2
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
     # 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
+sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlalchemy==1.4.12
+sqlalchemy==1.4.22
     # via -r requirements.in
 toml==0.10.2
     # via
-    #   pep517
     #   pylint
     #   pytest
-tqdm==4.60.0
+tomli==1.2.0
+    # via pep517
+tqdm==4.61.2
     # via twine
-twine==3.4.1
+twine==3.4.2
     # via -r requirements-dev.in
-urllib3==1.26.4
+urllib3==1.26.6
     # via
     #   requests
     #   selenium
 webencodings==0.5.1
     # via bleach
 wheel==0.36.2
-    # via -r requirements-dev.in
+    # via
+    #   -r requirements-dev.in
+    #   pip-tools
 wrapt==1.12.1
     # via astroid
-zipp==3.4.1
+zipp==3.5.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

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
@@ -8,49 +8,49 @@ alabaster==0.7.12
     # via sphinx
 babel==2.9.1
     # via sphinx
-certifi==2020.12.5
+certifi==2021.5.30
     # via requests
-chardet==4.0.0
+charset-normalizer==2.0.3
     # via requests
-click==7.1.2
+click==8.0.1
     # via -r requirements.in
-codechat==1.8.6
+codechat==1.8.8
     # via -r requirements.in
 cogapp==3.0.0
     # via -r requirements.in
 docutils==0.16
     # via
     #   codechat
     #   sphinx
-greenlet==1.0.0
+greenlet==1.1.0
     # via sqlalchemy
-idna==2.10
+idna==3.2
     # via requests
 imagesize==1.2.0
     # via sphinx
-jinja2==2.11.3
+jinja2==3.0.1
     # via sphinx
 lxml==4.6.3
     # via codechat
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via jinja2
-packaging==20.9
+packaging==21.0
     # via sphinx
 paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pygments==2.8.1
+pygments==2.9.0
     # via
     #   codechat
     #   sphinx
 pyparsing==2.4.7
     # via packaging
 pytz==2021.1
     # via babel
-requests==2.25.1
+requests==2.26.0
     # via sphinx
-six==1.15.0
+six==1.16.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==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
     # 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
+sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlalchemy==1.4.12
+sqlalchemy==1.4.22
     # via -r requirements.in
-urllib3==1.26.4
+urllib3==1.26.6
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file: