diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 41066a5..fa8b1dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/requirements-dev.txt b/requirements-dev.txt index 2a71626..3e7c89d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ flake8 pytest +xpdsim nose codecov coverage diff --git a/xpdtools/cli/process_tiff.py b/xpdtools/cli/process_tiff.py index d641e9a..16aeee1 100644 --- a/xpdtools/cli/process_tiff.py +++ b/xpdtools/cli/process_tiff.py @@ -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,) diff --git a/xpdtools/tools.py b/xpdtools/tools.py index 960c6cf..a7af20d 100644 --- a/xpdtools/tools.py +++ b/xpdtools/tools.py @@ -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] @@ -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