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

Black formatting #14

Merged
merged 2 commits into from
Dec 4, 2022
Merged

Black formatting #14

merged 2 commits into from
Dec 4, 2022

Conversation

ziw-liu
Copy link
Collaborator

@ziw-liu ziw-liu commented Dec 2, 2022

Resolves #8 with black formatting. Pre-commit hooks suggested by @JoOkuma are yet to be implemented.

Blame view should not be affected on GitHub.

To ignore the formatting commit locally, follow this guide. TLDR: in repo root directory run:

git config blame.ignoreRevsFile .git-blame-ignore-revs

@ziw-liu ziw-liu added enhancement New feature or request meta About how we organize the project labels Dec 2, 2022
@ziw-liu ziw-liu added this to the 0.0.1 milestone Dec 2, 2022
@ziw-liu ziw-liu self-assigned this Dec 2, 2022
@ziw-liu
Copy link
Collaborator Author

ziw-liu commented Dec 2, 2022

Note that for the blame ignoring to work after merging, the commits in this PR cannot be squashed.

@ziw-liu ziw-liu merged commit 181cce0 into main Dec 4, 2022
@ziw-liu ziw-liu deleted the black-formatting branch December 4, 2022 23:32
@ziw-liu ziw-liu mentioned this pull request Jan 19, 2023
ziw-liu added a commit that referenced this pull request Mar 14, 2023
* Merge pull request #14 from mehta-lab/QLIPP_pipeline

recOrder pipeline infrastructure + qlipp pipeline submodule

* Merge pull request #22 from mehta-lab/zarr_converter

Zarr converter

* Merge pull request #52 from mehta-lab/fluor_deconv

Fluorescence Deconvolution and PhaseFromBF pipelines

* Merge pull request #31 from mehta-lab/calibration_plugin

Calibration/Acquisition Plugin

* Merge pull request #112 from mehta-lab/cleanup-tests-and-readme

Improved testing, configs, and dev tools

* Merge pull request #123 from mehta-lab/zarr-converter-position-bug

Fix ome-tif to zarr converter for acquisitions with micromanager beta

* Merge pull request #140 from mehta-lab/restructure_tests

Restructure tests

* Merge pull request #148 from mehta-lab/pycromanager_converter_v2

Pycromanager converter v2

* Merge pull request #167 from mehta-lab/bkg-correction-fixes2

Fix background correction for non-square images and online mode

* Merge pull request #157 from mehta-lab/RAM-warning

Print RAM warning message in online and offline modes

* Merge pull request #169 from mehta-lab/warn-bkg-averaging

Remove background averaging

* Merge pull request #174 from mehta-lab/show-ram-warning

Show RAM warning in GUI / log in CLI

* Merge pull request #175 from mehta-lab/better-messages

Improved warning message

* Merge pull request #181 from mehta-lab/error-mismatched-bkg-and-img

Always load background and warn if background and image sizes are mismatched

* Merge pull request #182 from mehta-lab/error-mismatched-bkg-and-img

Mismatched x/y size of background and acquisition should error instead of warn

* Merge pull request #210 from mehta-lab/0.2.0-gui-hide

Remove fluorescence, preprocessing, and postprocessing; simplify GUI

* Merge pull request #219 from mehta-lab/0.2.0-integration

0.2.0 integration PR

* Introduce Black formatting into the code base (#229)

* black-format all `.py` files except recorder_ui.py

* create .git-blame-ignore-revs

* Document how to ignore formatting commits

* Document `git` version

Co-authored-by: Talon Chandler <[email protected]>

* draft refactor for imread

* expose primary entry points

* fix type check and tests

Signed-off-by: Ziwen Liu <[email protected]>

* fix formatting

* update `imread` docstring

* define supported formats

Signed-off-by: Ziwen Liu <[email protected]>

* rename pycromanager reader to ndtiff

Pycromanager is no longer a dependency, and MM can also write NDTIFF.

Signed-off-by: Ziwen Liu <[email protected]>

* remove 'doesnt work' code

* improve error messages

* rearrange files from patch

* depend on tqdm for progress bar in conversion

* move util function

* delete other util functions

* make util function private

* remove redundant file

* rename converter file

* fix some of the references and docstrings

* draft refactor

* write with new ngff module

* fix position grid

* fix image check

* close writer after conversion

* test ome-tiff conversion

* handle invalid stage position metadata

* support labelling positions

* fix typo

* fix path type

* convert single page tiff datasets

This is rather broken: the reader does not handle metadata well

* allow longer conversion time in tests

Signed-off-by: Ziwen Liu <[email protected]>

* draft cli command

Signed-off-by: Ziwen Liu <[email protected]>

* fix argument

* detect flat ndtiff

* sort imports

Signed-off-by: Ziwen Liu <[email protected]>

* limit bar length

* add -h shortcut for help

* test cli

* fix get_image

* test against a random choice of dataset

---------

Signed-off-by: Ziwen Liu <[email protected]>
Co-authored-by: Cameron Foltz <[email protected]>
Co-authored-by: Shalin Mehta <[email protected]>
Co-authored-by: Talon Chandler <[email protected]>
Co-authored-by: Ivan Ivanov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request meta About how we organize the project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code formatting
2 participants