use upstream

missionpinball · Nov 19, 2016 · d1b4d89 · d1b4d89
1 parent 6dc0747
commit d1b4d89
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1 @@
-[submodule "mpf/pyserial_asyncio"]
-	path = mpf/pyserial_asyncio
-#	url = https://github.com/pyserial/pyserial-asyncio.git
-	url = https://github.com/jabdoa2/pyserial-asyncio.git
-	branch = improve_windows_support
+
diff --git a/mpf/core/clock.py b/mpf/core/clock.py
@@ -3,7 +3,7 @@
 import asyncio
 from functools import partial
 
-from mpf.pyserial_asyncio.serial_asyncio import create_serial_connection
+from serial_asyncio import create_serial_connection
 
 
 class PeriodicTask:

diff --git a/mpf/pyserial_asyncio b/mpf/pyserial_asyncio
diff --git a/mpf/tests/loop.py b/mpf/tests/loop.py
@@ -9,8 +9,7 @@
 import asyncio
 
 from mpf.core.clock import ClockBase
-
-from mpf.pyserial_asyncio.serial_asyncio import SerialTransport
+from serial_asyncio import SerialTransport
 
 
 class NextTimers:

diff --git a/setup.py b/setup.py
@@ -61,14 +61,14 @@
 
     include_package_data=True,
 
-    package_data={'': ['*.yaml', '*.png', '*.so', '*.pyd', '*.ogg', '*.wav', 'mpf/pyserial_asyncio/*']},
+    package_data={'': ['*.yaml', '*.png', '*.so', '*.pyd', '*.ogg', '*.wav']},
 
     # MANIFEST.in picks up the rest
     packages=['mpf'],
 
     zip_safe=False,
 
-    install_requires=['ruamel.yaml>=0.10, <0.11', 'pyserial'],
+    install_requires=['ruamel.yaml>=0.10, <0.11', 'pyserial>=3.2.0', 'pyserial-asyncio>=0.2'],
 
     tests_require=[],
     test_suite="mpf.tests",