Merge branch 'RunestoneInteractive:master' into master

Author: zihan21206

CONTRIBUTING.rst

@@ -15,7 +15,10 @@ Coding Standards
 
 *   All components must be Python 3 compatible.   The ``six`` module is already
     in the requirements.txt file, so feel free to use that.
-*   No Tabs for Python files (4 spaces = 1 indentation)
+*   No Tabs for Python files (4 spaces = 1 indentation) 
+*   We use black to format all of our Python code.
+*   No Tabs in Javascript files (4 spaces = 1 indentation)
+*   We use Prettier to format our Javascript - please make sure you configure prettier to use 4 spaces as the tab size.
 *   Avoid proliferation of jQuery versions.  Make your stuff compatible with the version
     of jQuery in the common folder.
 *   Avoid proliferation of additional third party javascript modules.  We are already out of

index.rst

@@ -28,7 +28,6 @@ Components
     runestone/__main__.py
     runestone/conftest.py
     runestone/shared_conftest.py
-    runestone/unittest_base.py
 
 
 Packaging

pytest.ini

@@ -0,0 +1,7 @@
+# ****************************
+# |docname| - Configure pytest
+# ****************************
+[pytest]
+# See `Registering marks <https://docs.pytest.org/en/stable/how-to/mark.html>`_; this mark is defined in `selenium_module_fixture`.
+markers =
+    exit_status_success: Determine if the runestone build exit code is checked by ``selenium_module_fixture``.

requirements-dev.txt

@@ -6,7 +6,7 @@
 #
 alabaster==0.7.12
     # via sphinx
-astroid==2.9.3
+astroid==2.11.2
     # via pylint
 async-generator==1.10
     # via
@@ -40,11 +40,13 @@ cogapp==3.3.0
     # via -r requirements.in
 colorama==0.4.4
     # via twine
-cryptography==36.0.1
+cryptography==36.0.2
     # via
     #   pyopenssl
     #   urllib3
-docutils==0.16
+dill==0.3.4
+    # via pylint
+docutils==0.17.1
     # via
     #   codechat
     #   myst-parser
@@ -59,16 +61,18 @@ idna==3.3
     #   urllib3
 imagesize==1.3.0
     # via sphinx
-importlib-metadata==4.11.2
+importlib-metadata==4.11.3
     # via
     #   keyring
+    #   sphinx
     #   twine
 iniconfig==1.1.1
     # via pytest
 isort==5.10.1
     # via pylint
 jinja2==3.0.3
     # via
+    #   -r requirements.in
     #   myst-parser
     #   sphinx
 keyring==23.5.0
@@ -81,9 +85,9 @@ markdown-it-py==2.0.1
     # via
     #   mdit-py-plugins
     #   myst-parser
-markupsafe==2.1.0
+markupsafe==2.1.1
     # via jinja2
-mccabe==0.6.1
+mccabe==0.7.0
     # via pylint
 mdit-py-plugins==0.3.0
     # via myst-parser
@@ -121,23 +125,23 @@ pygments==2.11.2
     #   codechat
     #   readme-renderer
     #   sphinx
-pylint==2.12.2
+pylint==2.13.1
     # via -r requirements-dev.in
 pyopenssl==22.0.0
     # via urllib3
 pyparsing==3.0.7
     # via packaging
 pysocks==1.7.1
     # via urllib3
-pytest==7.0.1
+pytest==7.1.1
     # via -r requirements-dev.in
-pytz==2021.3
+pytz==2022.1
     # via babel
 pyvirtualdisplay==3.0
     # via -r requirements-dev.in
 pyyaml==6.0
     # via myst-parser
-readme-renderer==32.0
+readme-renderer==34.0
     # via
     #   -r requirements-dev.in
     #   twine
@@ -150,7 +154,7 @@ requests-toolbelt==0.9.1
     # via twine
 rfc3986==2.0.0
     # via twine
-selenium==4.1.2
+selenium==4.1.3
     # via -r requirements-dev.in
 six==1.16.0
     # via
@@ -182,15 +186,14 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlalchemy==1.4.31
+sqlalchemy==1.4.32
     # via -r requirements.in
-toml==0.10.2
-    # via pylint
 tomli==2.0.1
     # via
     #   pep517
+    #   pylint
     #   pytest
-tqdm==4.63.0
+tqdm==4.63.1
     # via twine
 trio==0.20.0
     # via
@@ -205,7 +208,7 @@ typing-extensions==4.1.1
     #   astroid
     #   myst-parser
     #   pylint
-urllib3[secure,socks]==1.26.8
+urllib3[secure,socks]==1.26.9
     # via
     #   requests
     #   selenium
@@ -216,7 +219,7 @@ wheel==0.37.1
     # via
     #   -r requirements-dev.in
     #   pip-tools
-wrapt==1.13.3
+wrapt==1.14.0
     # via astroid
 wsproto==1.1.0
     # via trio-websocket

requirements.in

@@ -4,8 +4,9 @@
 click>=8.0
 Paver>=1.2.4
 six>1.12
-Sphinx<4.0.0
+Sphinx>=4.4.0
 sphinxcontrib-paverutils>=1.17
 cogapp>=2.5
 SQLAlchemy>=1.4.0
 CodeChat>=1.8.6
+jinja2<3.1.0

requirements.txt

@@ -18,19 +18,23 @@ codechat==1.9.0
     # via -r requirements.in
 cogapp==3.3.0
     # via -r requirements.in
-docutils==0.16
+docutils==0.17.1
     # via
     #   codechat
     #   sphinx
 idna==3.3
     # via requests
 imagesize==1.3.0
     # via sphinx
-jinja2==3.0.3
+importlib-metadata==4.11.3
     # via sphinx
+jinja2==3.0.3
+    # via
+    #   -r requirements.in
+    #   sphinx
 lxml==4.8.0
     # via codechat
-markupsafe==2.1.0
+markupsafe==2.1.1
     # via jinja2
 packaging==21.3
     # via sphinx
@@ -44,7 +48,7 @@ pygments==2.11.2
     #   sphinx
 pyparsing==3.0.7
     # via packaging
-pytz==2021.3
+pytz==2022.1
     # via babel
 requests==2.27.1
     # via sphinx
@@ -72,10 +76,9 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlalchemy==1.4.31
+sqlalchemy==1.4.32
     # via -r requirements.in
-urllib3==1.26.8
+urllib3==1.26.9
     # via requests
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+zipp==3.7.0
+    # via importlib-metadata

runestone/activecode/activecode.py

@@ -73,7 +73,7 @@ def setup(app):
 """
 
 TEMPLATE_START = """
-<div class="%(divclass)s">
+<div class="%(divclass)s %(optclass)s">
 <div data-component="activecode" id=%(divid)s data-question_label="%(question_label)s">
 <div id=%(divid)s_question class="ac_question col-md-12">
 """

runestone/activecode/css/activecode.css

@@ -49,28 +49,20 @@
     border: 0;
 }
 
-.ac_section {
+#main-content section .runestone.ac_section .ac_section {
     position: relative;
     margin-right: auto;
     margin-left: auto;
     max-width: 800px;
     clear: both;
 }
 
-.ac_section > *:not(.ac_section) {
-    max-width: 500pt;
-    margin-left: auto;
-    margin-right: auto;
-    position: relative;
-}
-
 .ac_section .clearfix {
     position: initial;
 }
 
 .ac_output {
     display: none;
-    max-width: 450px;
     background-color: inherit;
 }
 .ac_output pre {

runestone/activecode/js/activecode.js

@@ -893,7 +893,7 @@ export class ActiveCode extends RunestoneBase {
         var embedUrlStr = `${srcURL}#${srcVars}`;
         var myIframe = document.createElement("iframe");
         myIframe.setAttribute("id", this.divid + "_codelens");
-        myIframe.setAttribute("width", "800");
+        myIframe.setAttribute("width", "100%");
         myIframe.setAttribute("height", "500");
         myIframe.setAttribute("style", "display:block");
         myIframe.style.background = "#fff";
@@ -924,7 +924,7 @@ export class ActiveCode extends RunestoneBase {
         srcURL = eBookConfig.app + "/admin/diffviewer?divid=" + div_id;
         myIframe = document.createElement("iframe");
         myIframe.setAttribute("id", div_id + "_coach");
-        myIframe.setAttribute("width", "800px");
+        myIframe.setAttribute("width", "100%");
         myIframe.setAttribute("height", "500px");
         myIframe.setAttribute("style", "display:block");
         myIframe.style.background = "#fff";

runestone/animation/animation.py

@@ -29,7 +29,7 @@ def setup(app):
 
 
 SRC = """
-<div id="%(divid)s">
+<div id="%(divid)s" class="%(optclass)s">
 <canvas id="%(divid)s_canvas" width="400" height="400" style="border:4px solid blue"></canvas>
 <br />
 <button onclick="%(divid)s_anim = %(divid)s_init('%(divid)s')">Initialize</button>
@@ -60,12 +60,15 @@ class Animation(RunestoneIdDirective):
     optional_arguments = 1
     final_argument_whitespace = True
     has_content = False
-    option_spec = {
-        "modelfile": directives.unchanged,
-        "viewerfile": directives.unchanged,
-        "model": directives.unchanged,
-        "viewer": directives.unchanged,
-    }
+    option_spec = RunestoneIdDirective.option_spec.copy()
+    option_spec.update(
+        {
+            "modelfile": directives.unchanged,
+            "viewerfile": directives.unchanged,
+            "model": directives.unchanged,
+            "viewer": directives.unchanged,
+        }
+    )
 
     def run(self):
         """