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.

Sign up for GitHub

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

Jump to bottom

Impose pydantic <2.0 #4631

Merged
merged 1 commit into from Jul 2, 2023
Merged

Impose pydantic <2.0 #4631

merged 1 commit into from Jul 2, 2023

Conversation

registerrier
Copy link
Contributor

Description

This pull request solves first point in #4630

Dear reviewer

@registerrier
Impose pydantic <2.0
fcab1cc 
Signed-off-by: Régis Terrier <rterrier@apc.in2p3.fr>
@registerrier registerrier added this to the 1.0.2 milestone Jul 2, 2023
@registerrier registerrier added infrastructure backport-v1.0.x on-merge: backport to v1.0.x backport-v1.1.x on-merge: backport to v1.1.x labels Jul 2, 2023
@registerrier registerrier merged commit aaa9f29 into gammapy:main Jul 2, 2023
10 of 13 checks passed
@lumberbot-app
Copy link

lumberbot-app bot commented Jul 2, 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 v1.0.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 aaa9f290de0e7e687d5126a8657555cff8721186
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #4631: Impose pydantic <2.0'
  1. Push to a named branch:
git push YOURFORK v1.0.x:auto-backport-of-pr-4631-on-v1.0.x
  1. Create a PR against branch v1.0.x, I would have named this PR:

"Backport PR #4631 on branch v1.0.x (Impose pydantic <2.0)"

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.

@meeseeksmachine meeseeksmachine mentioned this pull request Jul 2, 2023
Merged
meeseeksmachine pushed a commit to meeseeksmachine/gammapy that referenced this pull request Jul 2, 2023
@registerrier @meeseeksmachine
Backport PR gammapy#4631: Impose pydantic <2.0
a98e8e3
registerrier added a commit to registerrier/gammapy that referenced this pull request Jul 2, 2023
@registerrier
Merge pull request gammapy#4631 from registerrier/pydantic2.0
5a53e4a 
Impose pydantic <2.0

(cherry picked from commit aaa9f29)
registerrier added a commit that referenced this pull request Jul 2, 2023
@registerrier
Merge pull request #4632 from meeseeksmachine/auto-backport-of-pr-463…
4c49aa6 
…1-on-v1.1.x

Backport PR #4631 on branch v1.1.x (Impose pydantic <2.0)
registerrier added a commit that referenced this pull request Jul 2, 2023
@registerrier
Merge pull request #4633 from registerrier/auto-backport-of-pr-4631-o…
f310984 
…n-v1.0.x

Backport PR #4631 on branch v1.0.x (Impose pydantic <2.0)
@registerrier registerrier modified the milestones: 1.0.2, 1.2 Dec 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport-v1.0.x on-merge: backport to v1.0.x backport-v1.1.x on-merge: backport to v1.1.x infrastructure
Projects
None yet
Milestone
1.2
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@registerrier