Merge branch 'release/0.1.1'

berinhard · Jun 10, 2019 · 054ec31 · 054ec31
2 parents f6227ef + b3d148e
commit 054ec31
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 15 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,6 +1,10 @@
 Development
 -----------
 
+0.1.1
+-----
+- Fix install issue
+
 0.1.0
 -----
 - Simplification of pytop5js usage

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,3 @@
+recursive-include pyp5js/static *
+recursive-include pyp5js/assets *
+recursive-include pyp5js/templates *
diff --git a/docs/examples/sketch_008/index.html b/docs/examples/sketch_008/index.html
@@ -54,10 +54,10 @@
 
 rect_base_size = 30
 positions = []
-rect_offset = None
+rect_size = None
 
 def setup():
-    global rect_offset
+    global rect_size
 
     createP("Hi! This is an example of how to use p5.dom.js with pyp5js")
 
@@ -66,11 +66,11 @@
     slider_div.style("display", "block")
 
     # creates the slider
-    rect_offset = createSlider(0, 600, 100)
-    rect_offset.style('width', '50%')
+    rect_size = createSlider(0, 600, 100)
+    rect_size.style('width', '50%')
 
     # adds the slider to the container div
-    slider_div.child(rect_offset)
+    slider_div.child(rect_size)
 
     createCanvas(600, 600)
 
@@ -85,7 +85,7 @@
 
 def draw():
     background(255)
-    size = rect_offset.value()
+    size = rect_size.value()
     for x, y in positions:
         rect(x, y, size, size)
            </code>

diff --git a/docs/examples/sketch_008/sketch_008.py b/docs/examples/sketch_008/sketch_008.py
@@ -6,10 +6,10 @@
 
 rect_base_size = 30
 positions = []
-rect_offset = None
+rect_size = None
 
 def setup():
-    global rect_offset
+    global rect_size
 
     createP("Hi! This is an example of how to use p5.dom.js with pyp5js")
 
@@ -18,11 +18,11 @@ def setup():
     slider_div.style("display", "block")
 
     # creates the slider
-    rect_offset = createSlider(0, 600, 100)
-    rect_offset.style('width', '50%')
+    rect_size = createSlider(0, 600, 100)
+    rect_size.style('width', '50%')
 
     # adds the slider to the container div
-    slider_div.child(rect_offset)
+    slider_div.child(rect_size)
 
     createCanvas(600, 600)
 
@@ -37,6 +37,6 @@ def setup():
 
 def draw():
     background(255)
-    size = rect_offset.value()
+    size = rect_size.value()
     for x, y in positions:
         rect(x, y, size, size)
diff --git a/tests/__init__.py → pyp5js/tests/__init__.py b/tests/__init__.py → pyp5js/tests/__init__.py
diff --git a/tests/test_commands.py → pyp5js/tests/test_commands.py b/tests/test_commands.py → pyp5js/tests/test_commands.py
diff --git a/tests/test_compiler.py → pyp5js/tests/test_compiler.py b/tests/test_compiler.py → pyp5js/tests/test_compiler.py
diff --git a/tests/test_fs.py → pyp5js/tests/test_fs.py b/tests/test_fs.py → pyp5js/tests/test_fs.py
diff --git a/tests/test_monitor.py → pyp5js/tests/test_monitor.py b/tests/test_monitor.py → pyp5js/tests/test_monitor.py
diff --git a/tests/test_templates_renderer.py → pyp5js/tests/test_templates_renderer.py b/tests/test_templates_renderer.py → pyp5js/tests/test_templates_renderer.py
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 setup(
     name="pyp5js",
-    version="0.1.0",
+    version="0.1.1",
     description='Simple tool to allow to transcrypt Python code that uses P5.js',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -32,11 +32,11 @@
     maintainer_email='[email protected]',
     url="https://github.com/berinhard/pyp5js/",
     license='GNU Lesser General Public License version 3',
-    packages=find_packages(),
+    packages=find_packages(exclude=["pyp5js.tests"]),
     package_data={
         'pyp5js': [
             'assets/*',
-            'static/*',
+            'static/**/*',
             'templates/*',
         ]
     },