From 130f862984a5b01a54930f494f1bef684ba8b5e7 Mon Sep 17 00:00:00 2001 From: Andrew Leech Date: Mon, 26 Mar 2018 21:04:59 +1100 Subject: [PATCH] Use distribution of mpy-cross as default for %mpy-cross command Also support '*' in filename to run on multiple files --- jupyter_micropython_kernel/kernel.py | 14 +++++++------- setup.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jupyter_micropython_kernel/kernel.py b/jupyter_micropython_kernel/kernel.py index 5e4294d..8a95014 100644 --- a/jupyter_micropython_kernel/kernel.py +++ b/jupyter_micropython_kernel/kernel.py @@ -3,6 +3,8 @@ import logging, sys, time, os, re import serial, socket, serial.tools.list_ports, select import websocket # only for WebSocketConnectionClosedException +import mpy_cross +from glob import glob from . import deviceconnector logger = logging.getLogger(__name__) @@ -231,13 +233,11 @@ def interpretpercentline(self, percentline, cellcontents): if apargs and apargs.set_exe: self.mpycrossexe = apargs.set_exe elif apargs.pyfile: - if self.mpycrossexe: - self.dc.mpycross(self.mpycrossexe, apargs.pyfile) - else: - self.sres("Cross compiler executable not yet set\n", 31) - self.sres("try: %mpy-cross --set-exe /home/julian/extrepositories/micropython/mpy-cross/mpy-cross\n") - if self.mpycrossexe: - self.mpycrossexe = "/home/julian/extrepositories/micropython/mpy-cross/mpy-cross" + if not self.mpycrossexe: + self.mpycrossexe = mpy_cross.mpy_cross + + for pyfile in glob(apargs.pyfile): + self.dc.mpycross(self.mpycrossexe, pyfile) else: self.sres(ap_mpycross.format_help()) return cellcontents.strip() and cellcontents or None diff --git a/setup.py b/setup.py index 2a93738..1b73535 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,6 @@ url='https://github.com/goatchurchprime/jupyter_micropython_kernel', license='GPL3', packages=['jupyter_micropython_kernel'], - install_requires=['pyserial>=3.4', 'websocket-client>=0.44'] + install_requires=['pyserial>=3.4', 'websocket-client>=0.44', 'mpy-cross'] )