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

update license in cff #88

Merged
merged 1 commit into from
Nov 14, 2023
Merged

update license in cff #88

merged 1 commit into from
Nov 14, 2023

Conversation

nstarman
Copy link
Contributor

To make it match.

PR Checklist

  • Give a detailed description of the PR above.
  • Document changes in the CHANGES.rst file. See existing changelog for examples.
  • Add tests, if applicable, to ensure code coverage never decreases.
  • Make sure the docs are up to date, if applicable, particularly the docstrings and RST files in docs folder.
  • Ensure linear history by rebasing, when requested by the maintainer.

Signed-off-by: nstarman <[email protected]>
@nstarman nstarman added this to the v0.1.x milestone Nov 14, 2023
@nstarman nstarman merged commit e5430d5 into cosmology-api:main Nov 14, 2023
10 checks passed
@nstarman
Copy link
Contributor Author

@meeseeksdev backport

@nstarman nstarman deleted the update-cff branch November 14, 2023 19:05
Copy link

lumberbot-app bot commented Nov 14, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v0.1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 e5430d5568de76fe80bec1367191f78bd6467819
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #88: update license in cff'
  1. Push to a named branch:
git push YOURFORK v0.1.x:auto-backport-of-pr-88-on-v0.1.x
  1. Create a PR against branch v0.1.x, I would have named this PR:

"Backport PR #88 on branch v0.1.x (update license in cff)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

nstarman added a commit to nstarman/cosmology-api that referenced this pull request Nov 14, 2023
Signed-off-by: nstarman <[email protected]>
(cherry picked from commit e5430d5)
Signed-off-by: nstarman <[email protected]>
nstarman added a commit that referenced this pull request Nov 14, 2023
(cherry picked from commit e5430d5)

Signed-off-by: nstarman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant