Skip to content

Commit

Permalink
Merge pull request #1844 from mu-editor/ipython_genutils
Browse files Browse the repository at this point in the history
Depend on `ipython_genutils` to fix issue with missing `ipykernel` dependency
  • Loading branch information
carlosperate authored Oct 5, 2021
2 parents 3f072a9 + 6659bca commit a992f9f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions mu/wheels/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"),
]

Expand Down
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a992f9f

Please sign in to comment.