NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitf5a6a87

committed

Merge branch 'main' into quickfix/pyscript_loading_sequence

2 parentsede0ada +b77b8ca commitf5a6a87Copy full SHA for f5a6a87

File tree

12 files changed

+34

-23

lines changed

GETTING-STARTED.md
README.md
pyscriptjs
- examples
- src
  - components
    - pyenv.ts
    - pytitle.ts
  - pyscript.py

12 files changed

+34

-23

lines changed

`‎GETTING-STARTED.md`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,17 @@ pyscript.write('pi', f'π is approximately {pi:.3f}')`
`114`	`114`
`115`	`115`	`In addition to the[Python Standard Library](https://docs.python.org/3/library/) and`
`116`	`116`	the`pyscript` module, many 3rd-party OSS packages will work out-of-the-box with PyScript.
`117`		-In order to use them you will need to declare the dependencies using the`<py-env>` in the
`118`		`-HTML head.`
	`117`	`+`
	`118`	+In order to use them you will need to delcare the dependencies using the`<py-env>` in the
	`119`	+HTML head. You can also link to`.whl` files directly on disk like in our[toga example](https://github.com/pyscript/pyscript/blob/main/pyscriptjs/examples/toga/freedom.html)
	`120`	`+`
	`121`	+```
	`122`	`+<py-env>`
	`123`	`+- './static/wheels/travertino-0.1.3-py3-none-any.whl'`
	`124`	`+</py-env>`
	`125`	+```
	`126`	`+`
	`127`	+If your`.whl` is not a pure Python wheel then open a PR or issue with[pyodide](https://github.com/pyodide/pyodide) to get it added herehttps://github.com/pyodide/pyodide/tree/main/packages. If there's enough popular demand the pyodide team will likely work on supporting your package, regardless things will likely move faster if you make the PR and consult with the team to get unblocked.
`119`	`128`
`120`	`129`	For example, NumPy and Matplotlib are available. Notice here we're using`<py-script output="plot">`
`121`	`130`	as a shortcut, which takes the expression on the last line of the script and runs`pyscript.write('plot', fig)`.
`@@ -197,4 +206,5 @@ fig`
`197`	`206`	`</py-script>`
`198`	`207`	`</body>`
`199`	`208`	`</html>`
`200`		-```
	`209`	+```
	`210`	`+`

`‎README.md`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,16 @@`
`5`	`5`	`###tl;dr`
`6`	`6`	`PyScript is a Pythonic alternative to Scratch, JSFiddle or other "easy to use" programming frameworks, making the web a friendly, hackable, place where anyone can author interesting and interactive applications.`
`7`	`7`
`8`		`-To demonstrate pyscript, see[the pyscript folder](pyscriptjs/README.md).`
	`8`	`+To get started see[GETTING-STARTED](GETTING-STARTED.md).`
	`9`	`+`
	`10`	`+For examples see[the pyscript folder](pyscriptjs/README.md).`
`9`	`11`
`10`	`12`	`###Longer Version`
`11`	`13`	`PyScript is a meta project that aims to combine multiple open technologies to create a framework for users to use Python (and other languages) to create sophisticated applications in the browser. It highly integrates with the way the DOM works in the browser and allows users to add logic, in Python, in a way that feels natural to web as well as Python developers.`
`12`	`14`
`13`	`15`	`##Try PyScript`
`14`	`16`
`15`		`-To try PyScript, import the pyscript to your html page with:`
	`17`	`+To try PyScript, import theappropriatepyscript files to your html page with:`
`16`	`18`	```
`17`	`19`	`<link rel="stylesheet" href="https://pyscript.net/alpha/pyscript.css" />`
`18`	`20`	`<script defer src="https://pyscript.net/alpha/pyscript.js"></script>`
@@ -28,9 +30,9 @@ Check out the `/examples` folder for more examples on how to use it, all you nee
`28`	`30`
`29`	`31`	`To contribute:`
`30`	`32`
`31`		`-* clone the repo`
	`33`	+* clone the repo`git clone https://github.com/pyscript/pyscript`
`32`	`34`	* cd into the main project folder with`cd pyscriptjs`
`33`		-* install the dependencies with`npm install`
	`35`	+* install the dependencies with`npm install` - make sure to use nodejs version >= 16
`34`	`36`	* run`npm run dev` to build and run the dev server. This will also watch for changes and rebuild when a file is saved
`35`	`37`
`36`	`38`	`##Resources`

`‎pyscriptjs/examples/antigravity.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`</head>`
`9`	`9`	`<py-env>`
`10`	`10`	`- paths:`
`11`		`- - /antigravity.py`
	`11`	`+ -./antigravity.py`
`12`	`12`	`</py-env>`
`13`	`13`	`<body>`
`14`	`14`	`<b>Based on xkcd: antigravity https://xkcd.com/353/.</b>`

`‎pyscriptjs/examples/numpy_canvas_fractals.html`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`<inputid="y1"type="text"value="5.0"style="width: 80px; text-align: right">`
`67`	`67`	`<spanstyle="white-space: pre">]</span>`
`68`	`68`	`</div>`
`69`		`-<divstyle="display: flex; flex-direaction: row; gap: 1em">`
	`69`	`+<divstyle="display: flex; flex-direction: row; gap: 1em">`
`70`	`70`	`<divstyle="white-space: pre"><inputtype="radio"id="conv"name="type"value="convergence"checked> convergence</div>`
`71`	`71`	`<divstyle="white-space: pre"><inputtype="radio"id="iter"name="type"value="iterations"> iterations</div>`
`72`	`72`	`</div>`
`@@ -82,8 +82,8 @@`
`82`	`82`	`- numpy`
`83`	`83`	`- sympy`
`84`	`84`	`- paths:`
`85`		`- - /palettes.py`
`86`		`- - /fractals.py`
	`85`	`+ -./palettes.py`
	`86`	`+ -./fractals.py`
`87`	`87`	`</py-env>`
`88`	`88`
`89`	`89`	`<py-script>`

`‎pyscriptjs/examples/panel_deckgl.html`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`<metaname="apple-mobile-web-app-capable"content="yes">`
`7`	`7`	`<metaname="apple-mobile-web-app-status-bar-style"content="default">`
`8`	`8`	`<metaname="theme-color"content="#0072b5">`
`9`		`-<metaname="name"content="Pyscript/Panel DeckGL Demo">`
	`9`	`+<metaname="name"content="PyScript/Panel DeckGL Demo">`
`10`	`10`
`11`		`-<title>Pyscript/Panel DeckGL Demo</title>`
	`11`	`+<title>PyScript/Panel DeckGL Demo</title>`
`12`	`12`	`<linkrel="icon"type="image/x-icon"href="./favicon.png">`
`13`	`13`
`14`	`14`	`<linkrel="stylesheet"href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"type="text/css"/>`

`‎pyscriptjs/examples/repl.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`<py-env>`
`15`	`15`	`- paths:`
`16`		`- - /antigravity.py`
	`16`	`+ -./antigravity.py`
`17`	`17`	`</py-env>`
`18`	`18`
`19`	`19`	`<body>`

`‎pyscriptjs/examples/repl2.html`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`- bokeh`
`18`	`18`	`- numpy`
`19`	`19`	`- paths:`
`20`		`- - /utils.py`
`21`		`- - /antigravity.py`
	`20`	`+ -./utils.py`
	`21`	`+ -./antigravity.py`
`22`	`22`	`</py-env>`
`23`	`23`
`24`	`24`	`<body>`

`‎pyscriptjs/examples/simple_clock.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`<scriptdefersrc="../build/pyscript.js"></script>`
`13`	`13`	`<py-env>`
`14`	`14`	`- paths:`
`15`		`- - /utils.py`
	`15`	`+ -./utils.py`
`16`	`16`	`</py-env>`
`17`	`17`	`</head>`
`18`	`18`

`‎pyscriptjs/examples/todo.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`<scriptdefersrc="/build/pyscript.js"></script>`
`13`	`13`	`<py-env>`
`14`	`14`	`- paths:`
`15`		`- - /utils.py`
	`15`	`+ -./utils.py`
`16`	`16`	`</py-env>`
`17`	`17`	`</head>`
`18`	`18`

`‎pyscriptjs/src/components/pyenv.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import*asjsyamlfrom'js-yaml';`
`2`	`2`
`3`		`-import{pyodideLoaded,loadedEnvironments,mode,addInitializer}from'../stores';`
	`3`	`+import{pyodideLoaded,addInitializer}from'../stores';`
`4`	`4`	`import{loadPackage,loadFromFile}from'../interpreter';`
`5`	`5`
`6`	`6`	`// Premise used to connect to the first available pyodide interpreter`

`‎pyscriptjs/src/components/pytitle.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import{BaseEvalElement}from'./base';`
`2`		`-import{addClasses,ltrim,htmlDecode}from'../utils';`
	`2`	`+import{addClasses,htmlDecode}from'../utils';`
`3`	`3`
`4`	`4`	`exportclassPyTitleextendsBaseEvalElement{`
`5`	`5`	`shadow:ShadowRoot;`

`‎pyscriptjs/src/pyscript.py`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-fromjsimportdocument,setInterval,console`
`2`		`-importmicropip`
	`1`	`+fromjsimportdocument,console`
`3`	`2`	`importasyncio`
`4`		`-importio,base64,sys`
	`3`	`+importio,base64`
`5`	`4`
`6`	`5`	`loop=asyncio.get_event_loop()`
`7`	`6`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf5a6a87

File tree

12 files changed

12 files changed

`‎GETTING-STARTED.md`

`‎README.md`

`‎pyscriptjs/examples/antigravity.html`

`‎pyscriptjs/examples/numpy_canvas_fractals.html`

`‎pyscriptjs/examples/panel_deckgl.html`

`‎pyscriptjs/examples/repl.html`

`‎pyscriptjs/examples/repl2.html`

`‎pyscriptjs/examples/simple_clock.html`

`‎pyscriptjs/examples/todo.html`

`‎pyscriptjs/src/components/pyenv.ts`

`‎pyscriptjs/src/components/pytitle.ts`

`‎pyscriptjs/src/pyscript.py`

0 commit comments