Skip to content

deprecate asdf.types - #1401

Merged
braingram merged 3 commits into
asdf-format:masterfrom
braingram:deprecate/types
Feb 22, 2023
Merged

deprecate asdf.types#1401
braingram merged 3 commits into
asdf-format:masterfrom
braingram:deprecate/types

Conversation

@braingram

@braingram braingram commented Feb 20, 2023

Copy link
Copy Markdown
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
@braingram braingram mentioned this pull request Feb 20, 2023
Closed
14 of 15 tasks
WilliamJamieson
WilliamJamieson previously requested changes Feb 21, 2023
View reviewed changes

@WilliamJamieson WilliamJamieson left a comment

Copy link
Copy Markdown
Contributor

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.

Comment thread asdf/reference.py Resolved
Comment thread asdf/tags/core/complex.py 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

lumberbot-app Bot commented Feb 22, 2023

Copy link
Copy Markdown

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.

@braingram
braingram deleted the deprecate/types branch February 22, 2023 14:29
@WilliamJamieson

WilliamJamieson commented Feb 22, 2023

Copy link
Copy Markdown
Contributor

@meeseeksdev backport to 2.15.x

@lumberbot-app

lumberbot-app Bot commented Feb 22, 2023

Copy link
Copy Markdown

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

WilliamJamieson commented Feb 22, 2023

Copy link
Copy Markdown
Contributor

@meeseeksdev backport to 2.15.x

@meeseeksmachine meeseeksmachine mentioned this pull request Feb 22, 2023
Merged
meeseeksmachine pushed a commit to meeseeksmachine/asdf that referenced this pull request Feb 22, 2023
@braingram @meeseeksmachine
Backport PR asdf-format#1401: deprecate asdf.types
b087b7c
github-actions Bot pushed a commit that referenced this pull request Feb 22, 2023
@braingram @github-actions
Backport PR #1401: deprecate asdf.types
6f4dc21
This was referenced Feb 22, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@WilliamJamieson WilliamJamieson WilliamJamieson approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Downstream CI

Projects

None yet

Milestone

2.15.0

Development

Successfully merging this pull request may close these issues.

2 participants

@braingram @WilliamJamieson