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

Apply yapf to meep.adjoint.* #1590

Merged
merged 1 commit into from
Jun 4, 2021

Conversation

ianwilliamson
Copy link
Contributor

@ianwilliamson ianwilliamson commented Jun 3, 2021

This PR applies YAPF to meep.adjoint.* via the command:

yapf -p -i *.py

which uses the default PEP8 style.

@ianwilliamson ianwilliamson mentioned this pull request Jun 3, 2021
@stevengj
Copy link
Collaborator

stevengj commented Jun 4, 2021

@smartalecH, I'm okay with merging this, are you?. If you have a large PR pending we can wait to merge that first, but in any case the procedure outlined in #662 should work to automate rebasing any branches you are currently working on.

@smartalecH
Copy link
Collaborator

@stevengj sure, I'm fine with rebasing my upcoming PR when it's ready. Thanks for asking.

@stevengj stevengj merged commit 483b055 into NanoComp:master Jun 4, 2021
@stevengj
Copy link
Collaborator

stevengj commented Jun 4, 2021

Instructions for rebasing other branches after this PR:

Replace MYBRANCH below with the name of your branch:

# update repo
git checkout master && git pull origin master # update master

# switch to your branch
git checkout MYBRANCH

# rebase onto PREVIOUS commit
git rebase 2d90872abe0ea96ca22ebaf1cf029c3948f4547d

# reformat and rebase to THIS PR's commit
yapf -p -i python/adjoint/*.py
git commit -a -m "reformat"
git rebase -Xtheirs 483b0557eca81db35013cb9f5c688f497b711b5a

# finish rebase
git rebase master

@ianwilliamson ianwilliamson deleted the yapf-to-adjoint branch June 4, 2021 19:43
@smartalecH smartalecH mentioned this pull request Jun 21, 2021
4 tasks
bencbartlett pushed a commit to bencbartlett/meep that referenced this pull request Sep 9, 2021
@ianwilliamson ianwilliamson mentioned this pull request Aug 1, 2022
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants