Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump napari to 0.3.4 #1889

Merged
merged 1 commit into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion requirements/REQUIREMENTS-NAPARI-CI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ backcall==0.1.0
bleach==3.1.4
boto3==1.12.32
botocore==1.15.32
cachey==0.2.1
certifi==2019.11.28
chardet==3.0.4
click==7.1.1
Expand All @@ -21,6 +22,7 @@ entrypoints==0.3
freetype-py==2.1.0.post1
fsspec==0.7.1
h5py==2.10.0
HeapDict==1.0.1
idna==2.9
imageio==2.8.0
imagesize==1.2.0
Expand All @@ -42,7 +44,9 @@ matplotlib==3.2.1
mistune==0.8.4
more-itertools==8.2.0
mpmath==1.1.0
napari==0.2.12
napari==0.3.4
napari-plugin-engine==0.1.6
napari-svg==0.1.3
nbconvert==5.6.1
nbformat==5.0.4
networkx==2.4
Expand All @@ -59,6 +63,7 @@ Pillow==7.0.0
pluggy==0.13.1
prometheus-client==0.7.1
prompt-toolkit==3.0.5
psutil==5.7.0
ptyprocess==0.6.0
py==1.8.1
Pygments==2.6.1
Expand Down Expand Up @@ -99,6 +104,7 @@ sphinxcontrib-serializinghtml==1.1.4
sympy==1.5.1
terminado==0.8.3
testpath==0.4.4
tifffile==2020.6.3
toolz==0.10.0
tornado==6.0.4
tqdm==4.44.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/REQUIREMENTS-NAPARI-CI.txt.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
napari >= 0.2.8
napari >= 0.3.4
pytest-qt
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
packages=setuptools.find_packages(),
install_requires=install_requires,
extras_require={
'napari': [f"napari>={napari_version}"],
'napari': [f"napari[all]>={napari_version}"],
},
entry_points={
'console_scripts': [
Expand Down
4 changes: 2 additions & 2 deletions starfish/core/_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Viewer = None


NAPARI_VERSION = "0.2.6" # when changing this, update docs in display
NAPARI_VERSION = "0.3.4" # when changing this, update docs in display
INTERACTIVE = not hasattr(__main__, "__file__")


Expand Down Expand Up @@ -197,7 +197,7 @@ def display(
-----
- To use in ipython, use the `%gui qt` magic.
- napari axes are labeled with the ImageStack axis names
- Requires napari 0.2.6: use `pip install starfish[napari]`
- Requires napari 0.3.4: use `pip install starfish[napari]`
to install all necessary requirements
"""
if stack is None and spots is None and masks is None:
Expand Down
2 changes: 0 additions & 2 deletions starfish/core/test/test_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,3 @@ def test_display(qtbot, stack, spots, masks):
display(stack, spots, masks, viewer=viewer)
else:
display(stack, spots, masks, viewer=viewer)

view.shutdown()