Skip to content

Commit

Permalink
Merge pull request #270 from python-adaptive/ipyparallel-6.2.5
Browse files Browse the repository at this point in the history
minimally require ipyparallel 6.2.5
  • Loading branch information
basnijholt authored Apr 22, 2020
2 parents d563273 + e31ce1b commit a0b22ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- sortedcollections
- scipy
- holoviews
- ipyparallel
- ipyparallel>=6.2.5
- distributed
- ipykernel>=4.8*
- loky
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def get_version_and_cmdclass(package_name):
"pre_commit",
],
"other": [
"ipyparallel",
"ipyparallel>=6.2.5", # because of https://github.com/ipython/ipyparallel/issues/404
"distributed",
"loky",
"scikit-optimize",
Expand Down

0 comments on commit a0b22ff

Please sign in to comment.