Merge branch 'master' into peer_support

Author: bnmnetp

index.rst

@@ -26,6 +26,9 @@ Components
     runestone/*/toctree
     runestone/__init__.py
     runestone/__main__.py
+    runestone/conftest.py
+    runestone/shared_conftest.py
+    runestone/unittest_base.py
 
 
 Packaging
@@ -36,6 +39,7 @@ Packaging
     setup.py
     setup.cfg
     MANIFEST.in
+    webpack.config.js
 
 Misc
 ====
@@ -47,11 +51,11 @@ Misc
     runestone/conftest.py
     runestone/shared_conftest.py
     .gitignore
+    .github/workflows/python-package.yml
     .readthedocs.yml
     conf.py
     codechat_config.yaml
     requirements-dev.in
     requirements.in
-    webpack.config.js
     public/index.html
     makeRelease.sh

runestone/activecode/toctree.rst

@@ -1,6 +1,8 @@
 *************************************************
-ActiveCode
+ActiveCode - Run code in the browser
 *************************************************
+See the `overview <https://runestone.academy/runestone/books/published/overview/ActiveCode/toctree.html>`_.
+
 .. toctree::
     :maxdepth: 1
     :glob:

runestone/assignment/__init__.py

@@ -1,3 +1,7 @@
+# ***********************************************
+# |docname| - Define the ``assignment`` directive
+# ***********************************************
+#
 # Copyright (C) 2015  Paul Resnick
 #
 # This program is free software: you can redistribute it and/or modify

runestone/assignment/toctree.rst

@@ -1,11 +1,7 @@
-*************************************************
-Accessibility
-*************************************************
+**************************************************
+Assignment - directives for creating an assignment
+**************************************************
 .. toctree::
     :maxdepth: 1
-    :glob:
 
-    *.py
-    js/*.js
-    css/*.css
-    test/test_*.py
+    __init__.py

runestone/blockly/toctree.rst

@@ -1,11 +1,11 @@
-*************************************************
-Accessibility
-*************************************************
+********************************************************
+Blockly - Embed block-based code generation in Runestone
+********************************************************
+Warning: This component is deprecated. Do not use it in new books.
+
 .. toctree::
     :maxdepth: 1
     :glob:
 
+    README
     *.py
-    js/*.js
-    css/*.css
-    test/test_*.py

runestone/fitb/fitb.py

@@ -1,6 +1,6 @@
-# *********
-# |docname|
-# *********
+# ******************************************************************
+# |docname| - Provide Sphinx support for fill-in-the-blank questions
+# ******************************************************************
 #
 # .. Copyright (C) 2013  Bradley N. Miller
 #

runestone/fitb/js/fitb.js

@@ -199,7 +199,9 @@ export default class FITB extends RunestoneBase {
         // Grade locally if we can't ask the server to grade.
         if (this.feedbackArray) {
             this.evaluateAnswers();
-            this.renderFeedback();
+            if (!this.isTimed) {
+                this.renderFeedback();
+            }
         }
     }
 
@@ -234,7 +236,9 @@ export default class FITB extends RunestoneBase {
             this.correct = data.correct;
             this.displayFeed = data.displayFeed;
             this.isCorrectArray = data.isCorrectArray;
-            this.renderFeedback();
+            if (!this.isTimed) {
+                this.renderFeedback();
+            }
         }
         return data;
     }

runestone/lp/lp_common_lib.py

@@ -16,18 +16,22 @@
 import os.path
 
 
-# Given a file, return the inline comment token based on the file extension.
+# Given a file, return the inline comment token based on the file extension. Default to an empty string if we can't find the the provided language.
 def commentForExt(file_name):
     return {
-        ".py": "# ",
         ".c": "// ",
+        ".css": "/* ",  # Will need some hand editing...
         ".h": "// ",
+        ".ini": "; ",
         ".js": "// ",
-        ".s": "; ",
+        ".py": "# ",
+        # Rust.
+        ".rs": "// ",
         ".rst": "",
-        ".css": "/* ",  # Will need some hand editing...
-        ".ini": "; ",
-    }[os.path.splitext(file_name)[1]]
+        ".s": "; ",
+        # ARM assembly.
+        ".S": "@ ",
+    }.get(os.path.splitext(file_name)[1], "")
 
 
 # Relative to the Sphinx output directory, the path to student source (which has all feedback and code solutions removed).

runestone/mchoice/assess.py

@@ -85,15 +85,25 @@ def run(self):
 
 
 class QuestionNumber(RunestoneDirective):
-    """Set Parameters for Question Numbering
-.. qnum::
-   'prefix': character prefix before the number
-   'suffix': character prefix after the number
-   'start': start numbering with this value
-
-.. qnum::
-   :prefix: turtle-
-   :start: 10
+    """
+    Set Parameters for Question Numbering:
+
+    .. code-block:: rst
+        :linenos:
+
+        .. qnum::
+            'prefix': character prefix before the number
+            'suffix': character prefix after the number
+            'start': start numbering with this value
+
+    For example:
+
+    .. code-block:: rst
+        :linenos:
+
+        .. qnum::
+            :prefix: turtle-
+            :start: 10
     """
 
     required_arguments = 0

runestone/selectquestion/toctree.rst

@@ -0,0 +1,12 @@
+*************************************************
+Dynamic Questions
+*************************************************
+See the `overview book <https://runestone.academy/runestone/books/published/overview/Containers/dynamic.html>`_ for user documentation.
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    *.py
+    js/*.js
+    css/*.css