Merge branch 'RunestoneInteractive-master' into hparsons-sql

Author: zihan21206

.gitignore

@@ -48,6 +48,7 @@ bower_componenets/
 runestone/*/test/build_info
 **/sphinx_settings.json
 build_info
+runestone/dist*.tgz
 dist/
 
 # IDEs

makeRelease.sh

@@ -20,7 +20,7 @@ read -p "Did you update/commit the version in setup.py " yn
     esac
 done
 
-rm dist/*
+rm -f dist/*
 npm run dist
 python setup.py sdist
 pip wheel --no-index --no-deps --global-option bdist_wheel  --wheel-dir dist dist/*.tar.gz
@@ -33,3 +33,18 @@ echo "tagging this release and pushing to github"
 
 git tag -a $1 -m 'tag new version'
 git push --follow-tags
+
+
+if [ -d ~/.virtualenvs/json2xml ] 
+  then
+
+    echo "Creating dist for PreTeXt"
+    source ~/.virtualenvs/json2xml/bin/activate
+    python scripts/dist2xml.py $1 > runestone/dist/webpack_static_imports.xml
+    cd runestone
+    tar zcf dist-$1.tgz dist
+  else
+    echo "Warning: no json2xml ve found skipping pretext"
+fi
+
+

requirements-dev.txt

@@ -28,9 +28,9 @@ certifi==2021.10.8
     #   urllib3
 cffi==1.15.0
     # via cryptography
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
     # via requests
-click==8.0.3
+click==8.0.4
     # via
     #   -r requirements.in
     #   pip-tools
@@ -50,8 +50,6 @@ docutils==0.16
     #   myst-parser
     #   readme-renderer
     #   sphinx
-easyprocess==1.1
-    # via pyvirtualdisplay
 h11==0.13.0
     # via wsproto
 idna==3.3
@@ -61,7 +59,7 @@ idna==3.3
     #   urllib3
 imagesize==1.3.0
     # via sphinx
-importlib-metadata==4.10.1
+importlib-metadata==4.11.2
     # via
     #   keyring
     #   twine
@@ -77,21 +75,21 @@ keyring==23.5.0
     # via twine
 lazy-object-proxy==1.7.1
     # via astroid
-lxml==4.7.1
+lxml==4.8.0
     # via codechat
 markdown-it-py==2.0.1
     # via
     #   mdit-py-plugins
     #   myst-parser
-markupsafe==2.0.1
+markupsafe==2.1.0
     # via jinja2
 mccabe==0.6.1
     # via pylint
 mdit-py-plugins==0.3.0
     # via myst-parser
 mdurl==0.1.0
     # via markdown-it-py
-myst-parser==0.16.1
+myst-parser==0.17.0
     # via -r requirements-dev.in
 outcome==1.1.0
     # via trio
@@ -106,11 +104,11 @@ paver==1.3.4
     #   sphinxcontrib-paverutils
 pep517==0.12.0
     # via pip-tools
-pip-tools==6.4.0
+pip-tools==6.5.1
     # via -r requirements-dev.in
 pkginfo==1.8.2
     # via twine
-platformdirs==2.4.1
+platformdirs==2.5.1
     # via pylint
 pluggy==1.0.0
     # via pytest
@@ -129,11 +127,13 @@ pyopenssl==22.0.0
     # via urllib3
 pyparsing==3.0.7
     # via packaging
-pytest==6.2.5
+pysocks==1.7.1
+    # via urllib3
+pytest==7.0.1
     # via -r requirements-dev.in
 pytz==2021.3
     # via babel
-pyvirtualdisplay==2.2
+pyvirtualdisplay==3.0
     # via -r requirements-dev.in
 pyyaml==6.0
     # via myst-parser
@@ -150,7 +150,7 @@ requests-toolbelt==0.9.1
     # via twine
 rfc3986==2.0.0
     # via twine
-selenium==4.1.0
+selenium==4.1.2
     # via -r requirements-dev.in
 six==1.16.0
     # via
@@ -163,7 +163,7 @@ snowballstemmer==2.2.0
     # via sphinx
 sortedcontainers==2.4.0
     # via trio
-sphinx==3.5.4
+sphinx==4.4.0
     # via
     #   -r requirements.in
     #   myst-parser
@@ -185,29 +185,31 @@ sphinxcontrib-serializinghtml==1.1.5
 sqlalchemy==1.4.31
     # via -r requirements.in
 toml==0.10.2
+    # via pylint
+tomli==2.0.1
     # via
-    #   pylint
+    #   pep517
     #   pytest
-tomli==2.0.0
-    # via pep517
-tqdm==4.62.3
+tqdm==4.63.0
     # via twine
-trio==0.19.0
+trio==0.20.0
     # via
     #   selenium
     #   trio-websocket
 trio-websocket==0.9.2
     # via selenium
-twine==3.7.1
+twine==3.8.0
     # via -r requirements-dev.in
-typing-extensions==4.0.1
+typing-extensions==4.1.1
     # via
     #   astroid
+    #   myst-parser
     #   pylint
-urllib3[secure]==1.26.8
+urllib3[secure,socks]==1.26.8
     # via
     #   requests
     #   selenium
+    #   twine
 webencodings==0.5.1
     # via bleach
 wheel==0.37.1
@@ -216,7 +218,7 @@ wheel==0.37.1
     #   pip-tools
 wrapt==1.13.3
     # via astroid
-wsproto==1.0.0
+wsproto==1.1.0
     # via trio-websocket
 zipp==3.7.0
     # via importlib-metadata

requirements.txt

@@ -10,9 +10,9 @@ babel==2.9.1
     # via sphinx
 certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.11
+charset-normalizer==2.0.12
     # via requests
-click==8.0.3
+click==8.0.4
     # via -r requirements.in
 codechat==1.9.0
     # via -r requirements.in
@@ -28,9 +28,9 @@ imagesize==1.3.0
     # via sphinx
 jinja2==3.0.3
     # via sphinx
-lxml==4.7.1
+lxml==4.8.0
     # via codechat
-markupsafe==2.0.1
+markupsafe==2.1.0
     # via jinja2
 packaging==21.3
     # via sphinx
@@ -54,7 +54,7 @@ six==1.16.0
     #   paver
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==3.5.4
+sphinx==4.4.0
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils

runestone/activecode/js/activecode.js

@@ -23,6 +23,11 @@ import "codemirror/mode/clike/clike.js";
 import "codemirror/mode/octave/octave.js";
 import "./../css/activecode.css";
 import "codemirror/lib/codemirror.css";
+import "codemirror/addon/hint/show-hint.js";
+import "codemirror/addon/hint/show-hint.css";
+import "codemirror/addon/hint/sql-hint.js";
+import "codemirror/addon/hint/anyword-hint.js";
+import "codemirror/addon/edit/matchbrackets.js";
 import "./skulpt.min.js";
 import "./skulpt-stdlib.js";
 // Used by Skulpt.
@@ -43,6 +48,10 @@ window.edList = {};
 var socket, connection, doc;
 var chatcodesServer = "chat.codes";
 
+CodeMirror.commands.autocomplete = function (cm) {
+    cm.showHint({ hint: CodeMirror.hint.anyword });
+};
+
 // separate into constructor and init
 export class ActiveCode extends RunestoneBase {
     constructor(opts) {
@@ -73,6 +82,7 @@ export class ActiveCode extends RunestoneBase {
         this.loadButton = null;
         this.outerDiv = null;
         this.partner = "";
+        this.runCount = 0;
         this.logResults = true;
         if (!eBookConfig.allow_pairs || $(orig).data("nopair")) {
             this.enablePartner = false;
@@ -176,6 +186,7 @@ export class ActiveCode extends RunestoneBase {
             extraKeys: {
                 Tab: "indentMore",
                 "Shift-Tab": "indentLess",
+                "Ctrl-Space": "autocomplete",
             },
         });
         // Make the editor resizable
@@ -254,6 +265,10 @@ export class ActiveCode extends RunestoneBase {
         this.renderFeedback();
         // The run is finished; re-enable the button.
         this.runButton.disabled = false;
+        this.runCount += 1;
+        if (this.is_toggle && this.runCount == 3) {
+            alert("Help is Available Using the Toggle Question Selector");
+        }
     }
 
     createControls() {
@@ -476,8 +491,8 @@ export class ActiveCode extends RunestoneBase {
                     if (!didAgree) {
                         didAgree = confirm(
                             "Pair Programming should only be used with the consent of your instructor." +
-                            "Your partner must be a registered member of the class and have agreed to pair with you." +
-                            "By clicking OK you certify that both of these conditions have been met."
+                                "Your partner must be a registered member of the class and have agreed to pair with you." +
+                                "By clicking OK you certify that both of these conditions have been met."
                         );
                         if (didAgree) {
                             localStorage.setItem("partnerAgree", "true");
@@ -520,13 +535,13 @@ export class ActiveCode extends RunestoneBase {
         $(butt).attr(
             "href",
             "http://" +
-            chatcodesServer +
-            "/new?" +
-            $.param({
-                topic: window.location.host + "-" + this.divid,
-                code: this.editor.getValue(),
-                lang: "Python",
-            })
+                chatcodesServer +
+                "/new?" +
+                $.param({
+                    topic: window.location.host + "-" + this.divid,
+                    code: this.editor.getValue(),
+                    lang: "Python",
+                })
         );
         this.chatButton = butt;
         chatBar.appendChild(butt);
@@ -582,16 +597,21 @@ export class ActiveCode extends RunestoneBase {
             // If this is timed and already taken we should restore history info
             this.renderScrubber();
         } else {
-            let request = new Request(`${eBookConfig.new_server_prefix}/assessment/gethist`, {
-                method: "POST",
-                headers: this.jsonHeaders,
-                body: JSON.stringify(reqData),
-            });
+            let request = new Request(
+                `${eBookConfig.new_server_prefix}/assessment/gethist`,
+                {
+                    method: "POST",
+                    headers: this.jsonHeaders,
+                    body: JSON.stringify(reqData),
+                }
+            );
             try {
                 response = await fetch(request);
                 let data = await response.json();
                 if (!response.ok) {
-                    throw new Error(`Failed to get the history data: ${data.detail}`);
+                    throw new Error(
+                        `Failed to get the history data: ${data.detail}`
+                    );
                 }
                 data = data.detail;
                 if (data.history !== undefined) {
@@ -919,7 +939,7 @@ export class ActiveCode extends RunestoneBase {
         });
     }
 
-    toggleEditorVisibility() { }
+    toggleEditorVisibility() {}
 
     addErrorMessage(err) {
         // Add the error message
@@ -1057,7 +1077,7 @@ Yet another is that there is an internal error.  The internal error message is:
                     var xl = eval(x);
                     xl = xl.map(pyStr);
                     x = xl.join(" ");
-                } catch (err) { }
+                } catch (err) {}
             }
         }
         $(this.output).css("visibility", "visible");
@@ -1161,7 +1181,7 @@ Yet another is that there is an internal error.  The internal error message is:
         if (
             this.historyScrubber &&
             this.history[$(this.historyScrubber).slider("value")] !=
-            this.editor.getValue()
+                this.editor.getValue()
         ) {
             saveCode = "True";
             this.history.push(this.editor.getValue());
@@ -1220,7 +1240,7 @@ Yet another is that there is an internal error.  The internal error message is:
             if (typeof sid !== "undefined") {
                 unitData.sid = sid;
             }
-            await this.logBookEvent(unitData)
+            await this.logBookEvent(unitData);
         }
     }