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

[MAINT] Update pydantic to >=2.0 #985

Merged
merged 12 commits into from
Nov 22, 2024
Merged

[MAINT] Update pydantic to >=2.0 #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b2a26c1
[MAINT] Update pydantic to >=2.0
peytondmurray Nov 16, 2024
82a2616
Resolved another V1/V2 migration issue
peytondmurray Nov 16, 2024
7683abd
Replace instances of .dict() with .model_dump(); fix __fields__ usage
peytondmurray Nov 16, 2024
5e0f61a
Make BuildArtifactType use str mixin to allow Settings can serialize
peytondmurray Nov 16, 2024
43bbf7b
Write test to expose issue with parsing lockfile
soapy1 Nov 19, 2024
237d7e3
Rename LockfileSpecification dict to model_dump
soapy1 Nov 22, 2024
500b497
Lint
soapy1 Nov 22, 2024
f90213e
Merge pull request #6 from soapy1/fix-lockfile-spec-test
peytondmurray Nov 22, 2024
aef3063
Merge branch 'main' into 984-update-pydantic
peytondmurray Nov 22, 2024
1c6ae2e
Bump conda recipe pydantic dep
soapy1 Nov 22, 2024
1c321a4
Merge pull request #7 from soapy1/bump-conda-deps
peytondmurray Nov 22, 2024
cc2f0a8
Add model_dump in place of `dict` in test...
peytondmurray Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conda-store-server/conda_store_server/_internal/action/generate_lockfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def action_solve_lockfile(
lockfile_filename = pathlib.Path.cwd() / "conda-lock.yaml"

with environment_filename.open("w") as f:
json.dump(specification.dict(), f)
json.dump(specification.model_dump(), f)

context.log.info(
"Note that the output of `conda config --show` displayed below only reflects "
Expand Down Expand Up @@ -82,7 +82,7 @@ def action_save_lockfile(
):
# Note: this calls dict on specification so that the version field is
# part of the output
lockfile = specification.dict()["lockfile"]
lockfile = specification.model_dump()["lockfile"]
lockfile_filename = pathlib.Path.cwd() / "conda-lock.yaml"

with lockfile_filename.open("w") as f:
Expand Down
2 changes: 1 addition & 1 deletion conda-store-server/conda_store_server/_internal/action/install_specification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def action_install_specification(
):
environment_filename = pathlib.Path.cwd() / "environment.yaml"
with environment_filename.open("w") as f:
json.dump(specification.dict(), f)
json.dump(specification.model_dump(), f)

command = [
conda_command,
Expand Down
Loading
Loading