From 6659bca1b603ced4493963a409d11f46e6bdb059 Mon Sep 17 00:00:00 2001 From: carlosperate Date: Mon, 4 Oct 2021 21:13:39 +0100 Subject: [PATCH] Depend on ipython_genutils to fix issue with missing ipykernel dependency. --- mu/wheels/__init__.py | 5 +++++ setup.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/mu/wheels/__init__.py b/mu/wheels/__init__.py index 04ade7048..e5cba963d 100644 --- a/mu/wheels/__init__.py +++ b/mu/wheels/__init__.py @@ -45,6 +45,11 @@ class WheelsBuildError(WheelsError): # FIXME: ipykernel max ver added for macOS 10.13 compatibility, min taken # from qtconsole 4.7.7. This is mirrored in setup.py ("ipykernel", "ipykernel>=4.1,<6"), + # FIXME: ipykernel<6 depends on ipython_genutils, but it isn't explicitly + # declared as a dependency. It also depends on traitlets, which + # incidentally brought ipython_genutils, but in v5.1 it was dropped, so as + # a workaround we need to manually specify it here + ("ipython_genutils", "ipython_genutils>=0.2.0"), ("esptool", "esptool==3.*"), ] diff --git a/setup.py b/setup.py index a365ec2fc..93f99b1fb 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,11 @@ # qtconsole 4.7.7. Full line can be removed after Mu v1.1 release. # Dependency mirrored for user venv in mu/wheels/__init__.py "ipykernel>=4.1,<6", + # FIXME: ipykernel<6 depends on ipython_genutils, but it isn't explicitly + # declared as a dependency. It also depends on traitlets, which + # incidentally brought ipython_genutils, but in v5.1 it was dropped, so as + # a workaround we need to manually specify it here. + "ipython_genutils>=0.2.0", "qtconsole==4.7.7", # # adafruit-board-toolkit is used to find serial ports and help identify