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

deprecate asdf.types #1401

Merged
merged 3 commits into from
Feb 22, 2023
Merged

Conversation

braingram
Copy link
Contributor

No description provided.

@github-actions github-actions bot added this to the 2.15 milestone Feb 20, 2023
@braingram braingram marked this pull request as ready for review February 20, 2023 18:10
@braingram braingram requested a review from a team as a code owner February 20, 2023 18:10
Copy link
Contributor

@WilliamJamieson WilliamJamieson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have one question about AsdfType, see below.

asdf/reference.py Outdated Show resolved Hide resolved
asdf/tags/core/complex.py Outdated Show resolved Hide resolved
@braingram braingram force-pushed the deprecate/types branch 3 times, most recently from 668ec32 to 58725a6 Compare February 21, 2023 20:12
@braingram braingram dismissed WilliamJamieson’s stale review February 21, 2023 20:14

Button to re-request review does not exist

@braingram braingram merged commit fe64b85 into asdf-format:master Feb 22, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Feb 22, 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 2.15.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 fe64b85530738de5a751c8cfe32f8657a105fe22
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1401: deprecate asdf.types'
  1. Push to a named branch:
git push YOURFORK 2.15.x:auto-backport-of-pr-1401-on-2.15.x
  1. Create a PR against branch 2.15.x, I would have named this PR:

"Backport PR #1401 on branch 2.15.x (deprecate asdf.types)"

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.

@WilliamJamieson
Copy link
Contributor

@meeseeksdev backport to 2.15.x

@lumberbot-app
Copy link

lumberbot-app bot commented Feb 22, 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 2.15.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 fe64b85530738de5a751c8cfe32f8657a105fe22
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1401: deprecate asdf.types'
  1. Push to a named branch:
git push YOURFORK 2.15.x:auto-backport-of-pr-1401-on-2.15.x
  1. Create a PR against branch 2.15.x, I would have named this PR:

"Backport PR #1401 on branch 2.15.x (deprecate asdf.types)"

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.

@WilliamJamieson
Copy link
Contributor

@meeseeksdev backport to 2.15.x

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.

2 participants