|
1 |
| -/*Sun Nov 06 2022 15:37:14 GMT -0800 (Pacific Standard Time)*/ |
| 1 | +/*Sun Nov 06 2022 15:53:57 GMT -0800 (Pacific Standard Time)*/ |
2 | 2 |
|
3 | 3 | if (!window.pyprezUpdateDate){
|
4 | 4 | /* github pages can only serve one branch and takes a few minutes to update, this will help identify which version
|
5 | 5 | of code we are on */
|
6 |
| - var pyprezUpdateDate = new Date("Sun Nov 06 2022 15:37:14 GMT -0800 (Pacific Standard Time)"); |
7 |
| - var pyprezCommitMessage = "disable linting default"; |
8 |
| - var pyprezPrevCommit = "development:commit 00821134b665ac2a1b3c9de7d9ae3c08a6e9f8fe"; |
| 6 | + var pyprezUpdateDate = new Date("Sun Nov 06 2022 15:53:57 GMT -0800 (Pacific Standard Time)"); |
| 7 | + var pyprezCommitMessage = "fix imports"; |
| 8 | + var pyprezPrevCommit = "development:commit b49c434f40e62e250ff08c4266e3fb9778947c0d"; |
9 | 9 | }
|
10 | 10 |
|
11 | 11 | /*
|
@@ -45,7 +45,7 @@ if (!window.pyprezInitStarted){// allow importing this script multiple times wit
|
45 | 45 | showThemeSelect: true,
|
46 | 46 | showNamespaceSelect: false,
|
47 | 47 | patch: true,
|
48 |
| - lint: false |
| 48 | + lint: true |
49 | 49 | }
|
50 | 50 | let strConfig = {
|
51 | 51 | patchSrc: "https://modularizer.github.io/pyprez/patches.py",
|
@@ -609,25 +609,30 @@ if (!window.pyprezInitStarted){// allow importing this script multiple times wit
|
609 | 609 | console.debug("auto loading packages detected in code")
|
610 | 610 | return this.installPackagesFromComments(code).then(()=>{
|
611 | 611 | console.warn("installed it here")
|
612 |
| - return window.pyodide.loadPackage(requirements) |
| 612 | + return window.pyodide.loadPackagesFromImports(code) |
613 | 613 | })
|
614 | 614 | }
|
615 | 615 | }else{
|
616 | 616 | console.debug("loading", requirements)
|
617 | 617 | return this.installPackagesFromComments(code).then(()=>{
|
618 | 618 | console.warn("installed it here2")
|
619 |
| - return window.pyodide.loadPackage(requirements) |
| 619 | + return window.pyodide.loadPackagesFromImports(code) |
620 | 620 | })
|
621 | 621 | }
|
622 | 622 |
|
623 | 623 | })
|
624 | 624 | }
|
625 | 625 | installPackagesFromComments(code){
|
626 |
| - let m = code.match(/#\s*(micro)?pip\s*install\s*(\S*)/g); |
627 |
| - console.warn(m); |
628 |
| - let packageNames = m?m.map(s => s.match(/#\s*(micro)?pip\s*install\s*(\S*)/)[2]):[]; |
629 |
| - console.warn("preparing to micropip install", packageNames) |
630 |
| - return micropipPromise.then(()=>{console.warn('installing');return micropip.install(packageNames)}) |
| 626 | +// let m = code.match(/#\s*(micro)?pip\s*install\s*(\S*)/g); |
| 627 | +// console.warn(m); |
| 628 | +// let packageNames = m?m.map(s => s.match(/#\s*(micro)?pip\s*install\s*(\S*)/)[2]):[]; |
| 629 | +// if (packageNames.length){ |
| 630 | +// console.warn("preparing to micropip install", packageNames) |
| 631 | +// return micropipPromise.then(()=>{console.warn('installing');return micropip.install(packageNames)}) |
| 632 | +// }else{ |
| 633 | + return new Promise((res, rej)=>{res(true)}) |
| 634 | +// } |
| 635 | + |
631 | 636 | }
|
632 | 637 | loadAndRunAsync(code, namespace="global", requirements="detect"){
|
633 | 638 | /* run a python script asynchronously as soon as pyodide is loaded and all required packages are imported*/
|
@@ -769,7 +774,7 @@ if (!window.pyprezInitStarted){// allow importing this script multiple times wit
|
769 | 774 | }
|
770 | 775 |
|
771 | 776 | // now load packages detected in code imports
|
772 |
| - pyprez.installPackagesFromComments(this.code); |
| 777 | +// pyprez.installPackagesFromComments(this.code); |
773 | 778 | }
|
774 | 779 | loadEditor(){
|
775 | 780 | /* first load the editor as though codemirror does not and will not exist, then load codemirror*/
|
|
0 commit comments