search

manoharan-lab / holopy

Hologram processing and light scattering in python
GNU General Public License v3.0
131 stars 50 forks source link

Various small changes #390

Closed barkls closed 3 years ago

barkls commented 3 years ago

Accidentally pushed this to develop branch (I thought GitHub disallowed this, but clearly trusted it too much). I created a new branch before my changes for the purpose of this PR.

Haven't updated releasenotes - let me know if there's anything here that should be included.

pep8speaks commented 3 years ago

Hello @barkls! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! :beers:

Comment last updated at 2021-03-22 14:34:09 UTC
briandleahy commented 3 years ago

Hi @barkls -- what do you want me to do here since these are already merged into develop? Do you want me to just review the changes and make suggestions, then not merge it in?

Alternatively, we could clean the history if we want to keep the dev branch "clean" always, but I don't think it's worth it given how small this is.

barkls commented 3 years ago

I think the best thing would be for you to actually merge this PR in (develop branch -> dev branch) when you are satisfied. Then we can pull dev back into develop although there won't be any changes. That way we get the merge in the commit history and this PR shows as merged rather than closed on GitHub.

I'm happy to use another workflow though if you prefer something else!