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

replace np.bool with np.bool_ due to deprecation #96

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: test
# environment.yml file is needed by this action. Because I don't want
# maintain this but rather maintain the requirements files it just has
# basic things in it like conda and pip
channels: conda-forge
auto-update-conda: true
environment-file: ./environment.yml
auto-activate-base: false
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
flake8
pytest
xpdsim
nose
codecov
coverage
Expand Down
1 change: 1 addition & 0 deletions xpdtools/cli/process_tiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ def main(
import pyFAI

ns = make_pipeline(_output_sinks)
print(type(ns))

ns["polarization_array"].args = (polarization,)
ns["dark_corrected_background"].args = (bg_scale,)
Expand Down
4 changes: 2 additions & 2 deletions xpdtools/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def binned_outlier(
except AttributeError:
idx = binner.xy.argsort()
if tmsk is None:
tmsk = np.ones(np.shape(img), dtype=np.bool)
tmsk = np.ones(np.shape(img), dtype=bool)
tmsk = tmsk.flatten()
tmsk2 = tmsk[idx]
vfs = img.flatten()[idx]
Expand Down Expand Up @@ -189,7 +189,7 @@ def mask_img(
mask_method=auto_type,
pool=pool,
)
working_mask = working_mask.astype(np.bool)
working_mask = working_mask.astype(bool)
return working_mask


Expand Down
Loading