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

[cherry-pick] Fix mypy plugin for 1.1.0 #5110

Conversation

github-actions[bot]
Copy link
Contributor

Cherry picking #5077 onto this branch

* Fix mypy plugin for 1.1.0

* Code review

* Add version key to plugin data
@github-actions github-actions bot added cherry-pick-v1 cherry-pick back on 1.10.X-fixes from-cherry-pick created by cherry-picking from main labels Feb 24, 2023
BASESETTINGS_FULLNAME = 'pydantic.env_settings.BaseSettings'
MODEL_METACLASS_FULLNAME = 'pydantic.main.ModelMetaclass'
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to be an issue of the merge conflict resolution. The PR should only add MODEL_METACLASS_FULLNAME not replace BASESETTINGS_FULLNAME.

I've opened #5111 with a manual backport. Feel free to use that or close it if you'd like to change it here.

@samuelcolvin
Copy link
Member

replcaed by #5111

@samuelcolvin samuelcolvin deleted the cherry-pick-1.10.X-fixes-6267ae3538cf7237ff6769174b4c340415e0f444 branch April 28, 2023 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-v1 cherry-pick back on 1.10.X-fixes from-cherry-pick created by cherry-picking from main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants