feat(deps)!: switch to pydantic 2 #1777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BuildPlanner tests are still failing due to validation issues.
`build-for` now has to be a list, even with `all`. So `build-for: all` in yaml becomes `build-for: [all]`
The only thing that remained using this module was its set of tests.
Also removes the related unused test fixtures.
These are leftover from before the craft-application move, but were used for ensuring compatibility of the commands. Now that they're no longer needed, we can eliminate them.
craft-application provides this so this one is redundant
Also removes the now-unused `format` module.
Everything from this function now exists in the AnalysisService.
Instead there's just a charmhub_config fixture that provides access to the charmhub staging.
'charmcraft-started-at' field is now timezone-aware
The plugin is now the first thing mentioned in a part.
lengau
force-pushed
the
work/1768/pydantic-2
branch
from
cb31611 to
a359a25
Compare
lengau
commented
Aug 8, 2024
charmcraft/commands/__init__.py
Outdated
lengau
force-pushed
the
work/1768/pydantic-2
branch
from
a359a25 to
1b42bc3
Compare
lengau
commented
Aug 8, 2024
charmcraft/commands/store.py
Outdated
charmcraft/commands/version.py
Outdated
charmcraft/config.py
Outdated
charmcraft/deprecations.py
Outdated
charmcraft/env.py
Outdated
tests/test_package.py
Outdated
| assert err[0]["msg"] == "extra fields not permitted" | ||
|
|
||
|
|
||
| def test_partconfig_bad_type(): |
There was a problem hiding this comment.
No longer necessary because the source configuration validator failing will prevent the charm-requirements validator from running.
tests/test_providers.py
Outdated
| @@ -46,14 +43,3 @@ def test_bundleplugin_get_build_commands(bundle_plugin, tmp_path): | |||
| f'mkdir -p "{str(tmp_path)}/parts/foo/install"', | |||
| f'cp -R -p -P {tmp_path}/parts/foo/build/* "{str(tmp_path)}/parts/foo/install"', | |||
| ] | |||
|
|
|||
|
|
|||
| def test_bundleplugin_invalid_properties(): | |||
There was a problem hiding this comment.
No longer necessary as this is tested in craft-parts itself.
| @@ -111,15 +110,6 @@ def test_get_build_commands(plugin, tmp_path): | |||
| ] | |||
|
|
|||
|
|
|||
| def test_invalid_properties(plugin): | |||
There was a problem hiding this comment.
No longer necessary as this is done in craft-parts itself.
tigarmo
approved these changes
Aug 8, 2024
| @@ -64,8 +64,8 @@ def from_charm(cls, charm: Charm) -> Self: | |||
|
|
|||
| Performs the necessary renaming and reorganisation. | |||
| """ | |||
| charm_dict = charm.dict( | |||
| include=const.METADATA_YAML_KEYS | {"title"}, | |||
| charm_dict = charm.model_dump( | |||
There was a problem hiding this comment.
should this have mode="json"?
There was a problem hiding this comment.
It doesn't need to here since we're converting Python types, but good question!
| """Preprocess any values that charmcraft infers, before attribute validation.""" | ||
| if "type" not in values: | ||
| raise ValueError("Project type must be declared in charmcraft.yaml.") | ||
|
|
||
| return values | ||
|
|
||
| @pydantic.validator("parts", pre=True, always=True, allow_reuse=True) |
There was a problem hiding this comment.
always=True
so this needs to be handled on the field now right? didn't this change break anything?
There was a problem hiding this comment.
The validation is still handled like the upstream one, but unfortunately this preprocessing can't work on the field itself :-/
Python 3.11 is the first version with `os.EX_OK`, but 3.12 is the version used on noble.
lengau
force-pushed
the
work/1768/pydantic-2
branch
from
49f451d to
29f22f9
Compare
On Windows, set the minimum to Python 3.11 as python 3.10 doesn't have os.EX_OK
mr-cal
approved these changes
Aug 8, 2024
lengau
force-pushed
the
work/1768/pydantic-2
branch
from
1ba946a to
52cd8cb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes the entirety of #1776