Merge branch 'master' of https://github.com/mu-editor/mu

.github/workflows/test.yml

@@ -44,11 +44,11 @@ jobs:
       - name: Run tests
         if: runner.os == 'Linux'
         run: xvfb-run make check
-        timeout-minutes: 3
+        timeout-minutes: 5
       - name: Run tests
         if: runner.os != 'Linux'
         run: python make.py check
-        timeout-minutes: 3
+        timeout-minutes: 5
 
   build-arm:
     runs-on: ubuntu-latest

mu/virtual_environment.py

@@ -604,15 +604,17 @@ def install_jupyter_kernel(self):
         """
         kernel_name = '"Python/Mu ({})"'.format(self.name)
         logger.info("Installing Jupyter Kernel: %s", kernel_name)
-        return self.run_python(
-            "-m",
-            "ipykernel",
-            "install",
-            "--user",
-            "--name",
-            self.name,
-            "--display-name",
-            kernel_name,
+        logger.debug(
+            self.run_python(
+                "-m",
+                "ipykernel",
+                "install",
+                "--user",
+                "--name",
+                self.name,
+                "--display-name",
+                kernel_name,
+            )
         )
 
     def install_baseline_packages(self):

mu/wheels/__init__.py

@@ -19,9 +19,7 @@
 mode_packages = [
     ("pgzero", "pgzero>=1.2.1"),
     ("flask", "flask==1.1.2"),
-    ("serial", "pyserial>=3.0"),
     ("qtconsole", "qtconsole==4.7.4"),
-    ("nudatus", "nudatus>=0.0.3"),
     ("esptool", "esptool==3.*"),
 ]
 WHEELS_DIRPATH = os.path.dirname(__file__)

setup.py

@@ -31,12 +31,9 @@
     + ';"arm" not in platform_machine and "aarch" not in platform_machine',
     "PyQtChart==5.13.1"
     + ';"arm" not in platform_machine and "aarch" not in platform_machine',
-    #
-    # FIXME: Maybe should be in a mode?
-    # qtconsole, pyserial
-    #
     "qtconsole==4.7.4",
     "pyserial==3.4",
+    "nudatus>=0.0.3",
     # `flake8` is actually a testing/packaging dependency that, among other
     # packages, brings in `pycodestyle` and `pyflakes` which are runtime
     # dependencies. For the sake of "locality", it is being declared here,
@@ -65,13 +62,6 @@
         "pytest-faulthandler",
         "pytest-timeout",
         "coverage",
-        #
-        # Mode-specific modules needed for testing
-        # TODO -- maybe mode-based tests should be run
-        # under the runtime venv?
-        #
-        'black>=19.10b0;python_version > "3.5"',
-        "nudatus",
     ],
     "docs": [
         "sphinx",