correct bundling

drewwhis · Aug 10, 2019 · 0bce0b7 · 0bce0b7
1 parent ebc46a4
commit 0bce0b7
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+build/
+dist/
+pybricks_fll.egg-info/
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2019 Lawrence Whisenant
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/__init__.pyi → README.md b/__init__.pyi → README.md
diff --git a/pybricks/__init__.py b/pybricks/__init__.py
diff --git a/ev3brick/__init__.pyi → pybricks/ev3brick.py b/ev3brick/__init__.pyi → pybricks/ev3brick.py
@@ -1,5 +1,4 @@
-from pybricks.parameters import (Align, Button, Color)
-
+from pybricks.parameters import (Align as Align, Color as Color)
 
 class sound:
     @classmethod
@@ -47,7 +46,7 @@ def clear(cls):
         """
 
     @classmethod
-    def image(cls, file_name: str, alignment: Align = Align.CENTER, coordinate: tuple = None, clear: bool = True):
+    def image(cls, file_name: str, alignment: _Align = _Align.CENTER, coordinate: tuple = None, clear: bool = True):
         """
         Show an image file. You can specify its placement either using alignmentor by specifying a coordinate, 
         but not both.
@@ -100,7 +99,7 @@ def voltage(cls) -> float:
         ...
 
 
-def buttons(channel: int) -> List[Button]:
+def buttons(channel: int) -> list:
     """
     Check which buttons on the infrared remote are pressed.
 
@@ -114,7 +113,7 @@ def buttons(channel: int) -> List[Button]:
     ...
 
 
-def light(color: Color):
+def light(color: _Color):
     """
     Set the color of the brick light.
 

diff --git a/ev3devices.pyi → pybricks/ev3devices.py b/ev3devices.pyi → pybricks/ev3devices.py
diff --git a/parameters.pyi → pybricks/parameters.py b/parameters.pyi → pybricks/parameters.py
diff --git a/robotics.pyi → pybricks/robotics.py b/robotics.pyi → pybricks/robotics.py
diff --git a/tools.pyi → pybricks/tools.py b/tools.pyi → pybricks/tools.py
diff --git a/setup.py b/setup.py
@@ -0,0 +1,21 @@
+import setuptools
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+        name="pybricks-fll",
+        version="0.1",
+        author="Lawrence (Drew) Whisenant",
+        author_email="[email protected]",
+        description="An interfaces package to write EV3 Python code.",
+        long_description=long_description,
+        long_description_content_type="text/markdown",
+        url="https://github.com/drewwhis/pybricks-fll",
+        packages=setuptools.find_packages(),
+        classifiers=[
+            "Programming Language :: Python :: 3",
+            "License :: OSI Approved :: MIT License",
+            "Operating System :: OS Independent",
+        ],
+)