Skip to content

[easy] update requirements #1683

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.

Sign up for GitHub

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

Merged
ttung merged 1 commit into from
Dec 4, 2019
Merged

[easy] update requirements #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions REQUIREMENTS-STRICT.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ appnope==0.1.0
attrs==19.3.0
backcall==0.1.0
bleach==3.1.0
boto3==1.10.19
botocore==1.13.19
certifi==2019.9.11
boto3==1.10.29
botocore==1.13.29
certifi==2019.11.28
chardet==3.0.4
Click==7.0
cycler==0.10.0
Expand All @@ -17,9 +17,9 @@ docutils==0.15.2
entrypoints==0.3
idna==2.8
imageio==2.6.1
importlib-metadata==0.23
importlib-metadata==1.1.0
ipykernel==5.1.3
ipython==7.9.0
ipython==7.10.1
ipython-genutils==0.2.0
ipywidgets==7.5.1
jedi==0.15.1
Expand All @@ -31,9 +31,9 @@ jupyter-client==5.3.4
jupyter-core==4.6.1
kiwisolver==1.1.0
MarkupSafe==1.1.1
matplotlib==3.1.1
matplotlib==3.1.2
mistune==0.8.4
more-itertools==7.2.0
more-itertools==8.0.0
mpmath==1.1.0
nbconvert==5.6.1
nbformat==4.4.0
Expand All @@ -48,11 +48,11 @@ pexpect==4.7.0
pickleshare==0.7.5
Pillow==6.2.1
prometheus-client==0.7.1
prompt-toolkit==2.0.10
prompt-toolkit==3.0.2
ptyprocess==0.6.0
Pygments==2.4.2
Pygments==2.5.2
pyparsing==2.4.5
pyrsistent==0.15.5
pyrsistent==0.15.6
python-dateutil==2.8.0
pytz==2019.3
PyWavelets==1.1.1
Expand All @@ -63,8 +63,8 @@ requests==2.22.0
s3transfer==0.2.1
scikit-image==0.15.0
scikit-learn==0.21.3
scipy==1.3.2
semantic-version==2.8.2
scipy==1.3.3
semantic-version==2.8.3
Send2Trash==1.5.0
showit==1.1.4
six==1.13.0
Expand All @@ -73,13 +73,13 @@ sympy==1.4
terminado==0.8.3
testpath==0.4.4
tornado==6.0.3
tqdm==4.38.0
tqdm==4.40.0
trackpy==0.4.2
traitlets==4.3.3
urllib3==1.25.7
validators==0.14.0
wcwidth==0.1.7
webencodings==0.5.1
widgetsnbextension==3.5.1
xarray==0.14.0
xarray==0.14.1
zipp==0.6.0
28 changes: 14 additions & 14 deletions starfish/REQUIREMENTS-STRICT.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ appnope==0.1.0
attrs==19.3.0
backcall==0.1.0
bleach==3.1.0
boto3==1.10.19
botocore==1.13.19
certifi==2019.9.11
boto3==1.10.29
botocore==1.13.29
certifi==2019.11.28
chardet==3.0.4
Click==7.0
cycler==0.10.0
Expand All @@ -17,9 +17,9 @@ docutils==0.15.2
entrypoints==0.3
idna==2.8
imageio==2.6.1
importlib-metadata==0.23
importlib-metadata==1.1.0
ipykernel==5.1.3
ipython==7.9.0
ipython==7.10.1
ipython-genutils==0.2.0
ipywidgets==7.5.1
jedi==0.15.1
Expand All @@ -31,9 +31,9 @@ jupyter-client==5.3.4
jupyter-core==4.6.1
kiwisolver==1.1.0
MarkupSafe==1.1.1
matplotlib==3.1.1
matplotlib==3.1.2
mistune==0.8.4
more-itertools==7.2.0
more-itertools==8.0.0
mpmath==1.1.0
nbconvert==5.6.1
nbformat==4.4.0
Expand All @@ -48,11 +48,11 @@ pexpect==4.7.0
pickleshare==0.7.5
Pillow==6.2.1
prometheus-client==0.7.1
prompt-toolkit==2.0.10
prompt-toolkit==3.0.2
ptyprocess==0.6.0
Pygments==2.4.2
Pygments==2.5.2
pyparsing==2.4.5
pyrsistent==0.15.5
pyrsistent==0.15.6
python-dateutil==2.8.0
pytz==2019.3
PyWavelets==1.1.1
Expand All @@ -63,8 +63,8 @@ requests==2.22.0
s3transfer==0.2.1
scikit-image==0.15.0
scikit-learn==0.21.3
scipy==1.3.2
semantic-version==2.8.2
scipy==1.3.3
semantic-version==2.8.3
Send2Trash==1.5.0
showit==1.1.4
six==1.13.0
Expand All @@ -73,13 +73,13 @@ sympy==1.4
terminado==0.8.3
testpath==0.4.4
tornado==6.0.3
tqdm==4.38.0
tqdm==4.40.0
trackpy==0.4.2
traitlets==4.3.3
urllib3==1.25.7
validators==0.14.0
wcwidth==0.1.7
webencodings==0.5.1
widgetsnbextension==3.5.1
xarray==0.14.0
xarray==0.14.1
zipp==0.6.0
2 changes: 1 addition & 1 deletion starfish/core/spots/DetectPixels/combine_adjacent_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def _calculate_mean_pixel_traces(

# the 0th pixel trace corresponds to background. If present, drop it.
try:
mean_pixel_traces = mean_pixel_traces.drop(0, dim=Features.AXIS)
mean_pixel_traces = mean_pixel_traces.drop_sel({Features.AXIS: 0})
Copy link
Collaborator Author

@ttung ttung Dec 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ambrosejcarr it looks like drop is being deprecated. I changed this to drop_sel, but there is no test coverage for this code. can you visually check this to see if it seems sane?

except KeyError:
pass

Expand Down