8000 Merge pull request #30 from anaconda/pys-22/support-pip-in-pyenv · robinboot/pyscript@e409f5c · GitHub
[go: up one dir, main page]
Skip to content

Commit e409f5c

Browse files
fpligerfpliger
authored
Merge pull request pyscript#30 from anaconda/pys-22/support-pip-in-pyenv
[PYS-22] support pip in pyenv
2 parents b5f8ce6 + 792db8c commit e409f5c

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

‎pyscriptjs/examples/panel.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313
<py-env>
1414
- bokeh
1515
- numpy
16+
- panel
1617
</py-env>
1718
<h1>Panel Example</h1>
1819
<div id="myplot"></div>
1920
<py-script>
2021
import asyncio
21-
import micropip
22-
23-
await micropip.install(['panel'])
24-
2522
import panel as pn
2623

2724
slider = pn.widgets.FloatSlider(start=0, end=10, name='Amplitude')

‎pyscriptjs/examples/panel_deckgl.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
- bokeh
4747
- numpy
4848
- pandas
49+
- panel==0.13.1a1
4950
</py-env>
5051

5152
<div class="container-fluid d-flex flex-column vh-100 overflow-hidden" id="container">
@@ -74,13 +75,10 @@
7475
</div>
7576
<py-script>
7677
import asyncio
77-
import micropip
7878

7979
from io import StringIO
8080
from js import fetch
8181

82-
await micropip.install(['panel==0.13.1a1'])
83-
8482
import panel as pn
8583
import param
8684
import pandas as pd

‎pyscriptjs/examples/panel_kmeans.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
- numpy
4848
- pandas
4949
- scikit-learn
50+
- panel
51+
- altair
5052
</py-env>
5153

5254
<div class="container-fluid d-flex flex-column vh-100 overflow-hidden" id="container">
@@ -78,13 +80,10 @@
7880
</div>
7981
<py-script>
8082
import asyncio
81-
import micropip
8283

8384
from io import StringIO
8485
from js import fetch
8586

86-
await micropip.install(['panel', 'altair'])
87-
8887
import altair as alt
8988
import panel as pn
9089
import pandas as pd

‎pyscriptjs/examples/panel_stream.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
- bokeh
4444
- numpy
4545
- pandas
46+
- panel
4647
</py-env>
4748

4849
<div class="container-fluid d-flex flex-column vh-100 overflow-hidden" id="container">
@@ -69,9 +70,6 @@
6970
</div>
7071
<py-script>
7172
import asyncio
72-
import micropip
73-
74-
await micropip.install(['panel'])
7573

7674
import panel as pn
7775
import numpy as np

‎pyscriptjs/src/interpreter.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ let pyodide;
77

88
let additional_definitions = `
99
from js import document, setInterval, console
10+
import micropip
1011
import asyncio
1112
import io, base64, sys
1213
@@ -178,7 +179,9 @@ let loadInterpreter = async function(): Promise<any> {
178179
}
179180

180181
let loadPackage = async function(package_name: string[] | string, runtime: any): Promise<any> {
181-
await runtime.loadPackage(package_name);
182+
let micropip = pyodide.globals.get('micropip');
183+
await micropip.install(package_name)
184+
micropip.destroy()
182185
}
183186

184187
let loadFromFile = async function(s: string, runtime: any): Promise<any> {

0 commit comments

Comments
 (0)
0