Skip to content

Commit a992f9f

Browse files
authored
Merge pull request #1844 from mu-editor/ipython_genutils
Depend on `ipython_genutils` to fix issue with missing `ipykernel` dependency
2 parents 3f072a9 + 6659bca commit a992f9f

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

mu/wheels/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ class WheelsBuildError(WheelsError):
4545
# FIXME: ipykernel max ver added for macOS 10.13 compatibility, min taken
4646
# from qtconsole 4.7.7. This is mirrored in setup.py
4747
("ipykernel", "ipykernel>=4.1,<6"),
48+
# FIXME: ipykernel<6 depends on ipython_genutils, but it isn't explicitly
49+
# declared as a dependency. It also depends on traitlets, which
50+
# incidentally brought ipython_genutils, but in v5.1 it was dropped, so as
51+
# a workaround we need to manually specify it here
52+
("ipython_genutils", "ipython_genutils>=0.2.0"),
4853
("esptool", "esptool==3.*"),
4954
]
5055

setup.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
# qtconsole 4.7.7. Full line can be removed after Mu v1.1 release.
3939
# Dependency mirrored for user venv in mu/wheels/__init__.py
4040
"ipykernel>=4.1,<6",
41+
# FIXME: ipykernel<6 depends on ipython_genutils, but it isn't explicitly
42+
# declared as a dependency. It also depends on traitlets, which
43+
# incidentally brought ipython_genutils, but in v5.1 it was dropped, so as
44+
# a workaround we need to manually specify it here.
45+
"ipython_genutils>=0.2.0",
4146
"qtconsole==4.7.7",
4247
#
4348
# adafruit-board-toolkit is used to find serial ports and help identify

0 commit comments

Comments
 (0)