Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
berinhard committed Oct 16, 2021
2 parents dade904 + 766af19 commit ee4bc6d
Show file tree
Hide file tree
Showing 125 changed files with 4,645 additions and 3,648 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Development
-----------

0.7.0
-----
- Remove `from pyp5js import *` requirement under transcrypt [PR #183](https://github.com/berinhard/pyp5js/pull/183/)
- Make local code editor collapsible [PR #184](https://github.com/berinhard/pyp5js/pull/184/)
- Add `mouseWheel` event to Pyodide's demo [PR #185](https://github.com/berinhard/pyp5js/pull/185/)

0.6.0
-----
- Add transcrypt interpreter choice to web editor [PR #175](https://github.com/berinhard/pyp5js/pull/175)
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ upload_pypi:

# helper command for the maintainer to refresh the docs files
refresh_transcrypt_docs:
cd docs/examples/transcrypt; for x in `ls -d */`; do SKETCHBOOK_DIR="/home/bernardo/envs/pyp5js/docs/examples/transcrypt" pyp5js compile $$x --refresh; done;
cd docs/examples/transcrypt; for x in `ls -d */`; do SKETCHBOOK_DIR="/home/bernardo/envs/pyp5js/docs/examples/transcrypt/" pyp5js compile $$x --refresh --template "/home/bernardo/envs/pyp5js/docs/examples/transcrypt/index.html.template"; done;

refresh_pyodide_docs:
cd docs/examples/pyodide; for x in `ls -d */`; do SKETCHBOOK_DIR="/home/bernardo/envs/pyp5js/docs/examples/pyodide" pyp5js compile $$x --refresh; done;
cd docs/examples/pyodide; for x in `ls -d */`; do SKETCHBOOK_DIR="/home/bernardo/envs/pyp5js/docs/examples/pyodide" pyp5js compile $$x --refresh --template "/home/bernardo/envs/pyp5js/docs/examples/pyodide/index.html.template"; done;

refresh_demo:
SKETCHBOOK_DIR="/home/bernardo/envs/pyp5js/docs/" pyp5js compile pyodide --refresh --template "/home/bernardo/envs/pyp5js/docs/pyodide/index.html.template";
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.7.0
3 changes: 0 additions & 3 deletions docs/examples/transcrypt/sketch_001/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
<code>
# https://p5js.org/examples/interaction-wavemaker.html


from pyp5js import *

t = 0

def setup():
Expand Down
3 changes: 0 additions & 3 deletions docs/examples/transcrypt/sketch_001/sketch_001.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# https://p5js.org/examples/interaction-wavemaker.html


from pyp5js import *

t = 0

def setup():
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ class Exception (BaseException):
#__pragma__ ('kwargs')
def __init__ (self, *args, **kwargs):
self.__args__ = args
try:
if kwargs.error != None:
self.stack = kwargs.error.stack # Integrate with JavaScript Error object
except:
elif Error:
self.stack = (__new__(Error())).stack # Create our own stack if we aren't given one
else:
self.stack = 'No stack trace available'
#__pragma__ ('nokwargs')

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/transcrypt/sketch_001/target/pyp5js.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 0 additions & 47 deletions docs/examples/transcrypt/sketch_001/target/sketch_001.js

This file was deleted.

31 changes: 0 additions & 31 deletions docs/examples/transcrypt/sketch_001/target/sketch_001.py

This file was deleted.

Loading

0 comments on commit ee4bc6d

Please sign in to comment.