Skip to content

Commit

Permalink
update pyodide
Browse files Browse the repository at this point in the history
  • Loading branch information
szabolcsdombi committed Oct 4, 2023
1 parent 78e0767 commit 1a56c50
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions examples/webgl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM python:3.11.2
ENV EMSDK=/opt/emsdk EMSDK_NODE=/opt/emsdk/node/14.18.2_64bit/bin/node \
PATH=/opt/emsdk:/opt/emsdk/upstream/emscripten:/opt/emsdk/node/14.18.2_64bit/bin:$PATH
FROM python:3.11.3
ENV EMSDK=/opt/emsdk EMSDK_NODE=/opt/emsdk/node/16.20.0_64bit/bin/node \
PATH=/opt/emsdk:/opt/emsdk/upstream/emscripten:/opt/emsdk/node/16.20.0_64bit/bin:$PATH
RUN git clone https://github.com/emscripten-core/emsdk.git $EMSDK &&\
emsdk install 3.1.32 && emsdk activate 3.1.32 && pip install pyodide-build==0.23.4
emsdk install 3.1.45 && emsdk activate 3.1.45 && pip install pyodide-build==0.24.1

RUN wget -q https://f003.backblazeb2.com/file/zengl-data/examples/web-example-assets.tar.gz

Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/blend.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
Expand All @@ -19,9 +19,9 @@

await pyodide.loadPackage([
'numpy',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/box_grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/game_of_life.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/hello_triangle.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/julia_fractal.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/rigged_objects.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'assets-0.1.0-py3-none-any.whl',
]);

Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/textured_crate.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'assets-0.1.0-py3-none-any.whl',
]);

Expand Down
8 changes: 4 additions & 4 deletions examples/webgl/public/zengl_logo.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<body class="example">
<canvas id="zengl-canvas", tabindex="1" width="1280" height="720"></canvas>
</body>
<script src="https://cdn.jsdelivr.net/pyodide/v0.23.4/full/pyodide.js"></script>
<script src="https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js"></script>
<script src="zengl_canvas.js"></script>
<script src="zengl_webgl.js"></script>
<script>
(async () => {
const pyodide = await loadPyodide();

await pyodide.loadPackage([
'zengl-1.13.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_32_wasm32.whl',
'zengl-1.13.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_webgl-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
'zengl_canvas-0.1.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
]);

const canvas = document.getElementById('zengl-canvas');
Expand Down

0 comments on commit 1a56c50

Please sign in to comment.