python311Packages.pydantic: 1.10.12 -> 2.3.0 by natsukium · Pull Request #269633 · NixOS/nixpkgs

natsukium · 2023-11-24T13:07:26Z

Description of changes

python311Packages.pydantic: 1.10.12 -> 2.3.0
Diff: pydantic/pydantic@refs/tags/v1.10.12...v2.3.0
Changelog: https://github.com/pydantic/pydantic/blob/v2.3.0/HISTORY.md
python311Packages.versioningit: 2.2.0 -> 2.2.1
Changelog: https://versioningit.readthedocs.io/en/latest/changelog.html
python311Packages.pydantic-settings: 2.0.3 -> 2.1.0
Diff: pydantic/pydantic-settings@v2.0.3...v2.1.0
python311Packages.fastapi: add optional-dependencies for pydantic 2
python311Packages.kanidm: 0.0.3 -> 0.0.3-unstable-2023-08-23
python311Packages.django-ninja: 0.22.2 -> 1.0.1
Diff: vitalik/django-ninja@v0.22.2...v1.0.1
Changelog: https://github.com/vitalik/django-ninja/releases/tag/v1.0.1
python311Packages.pythonfinder: 2.0.5 -> 2.0.6
Diff: sarugaku/pythonfinder@refs/tags/2.0.5...2.0.6
Changelog: https://github.com/sarugaku/pythonfinder/blob/v2.0.6/CHANGELOG.rst
stacs: pin pydantic<2
python311Packages.pyaussiebb: 0.0.18 -> 0.1.1
Diff: yaleman/pyaussiebb@refs/tags/v0.0.18...v0.1.1
Changelog: https://github.com/yaleman/pyaussiebb/blob/v0.1.1/CHANGELOG.md
python311Packages.demetriek: apply a pydantic>=2 compatible patch
python311Packages.aiopurpleair: 2022.12.1 -> 2023.10.0
Diff: bachya/aiopurpleair@refs/tags/2022.12.1...2023.10.0
Changelog: https://github.com/bachya/aiopurpleair/releases/tag/2023.10.0
python311Packages.aionotion: 2023.05.5 -> 2023.08.0
Diff: bachya/aionotion@2023.05.5...2023.08.0
Changelog: https://github.com/bachya/aionotion/releases/tag/2023.08.0
python311Packages.fastapi-mail: 1.3.1 -> 1.4.1
Diff: sabuhish/fastapi-mail@refs/tags/1.3.1...1.4.1
Changelog: https://github.com/sabuhish/fastapi-mail/releases/tag/1.4.1
python311Packages.rstcheck-core: 1.0.3 -> 1.2.0
Diff: rstcheck/rstcheck-core@refs/tags/v1.0.3...v1.2.0
Changelog: https://github.com/rstcheck/rstcheck-core/blob/v1.2.0/CHANGELOG.md
python311Packages.strawberry-graphql: fix test with pydantic>=2

Things done

Priorities

Add a 👍 reaction to pull requests you find important.

Eval reports

https://gist.github.com/natsukium/3d7429de0b016cf07492f3561331d002

Known issue

pkgs/development/python-modules/pydantic/default.nix

augustebaum · 2023-11-25T11:21:09Z

Should also help with python3Packages.pydantic-extra-types (see Hydra failure logs).
EDIT: Verified it works!

mweinelt · 2023-11-25T11:22:17Z

Should also help with python3Packages.pydantic-extra-types (see Hydra failure logs).

Which is only broken because I introduced it before reverting pydantic back to 1.x.

mweinelt · 2023-11-25T20:15:09Z

List of newly failing builds between master and this branch for pkgs/top-level/release-python.nix.

Edit: Excluded builds that failed transitively.

cloudflare-dyndns.x86_64-linux
flare-floss.x86_64-linux
frigate.x86_64-linux
home-assistant-component-tests.lametric.x86_64-linux
home-assistant-component-tests.notion.x86_64-linux
home-assistant-component-tests.peco.x86_64-linux
home-assistant-component-tests.zwave_js.x86_64-linux
khoj.x86_64-linux
octoprint.x86_64-linux
python310Packages.bentoml.x86_64-linux
python310Packages.correctionlib.x86_64-linux
python310Packages.dbt-semantic-interfaces.x86_64-linux
python310Packages.deepwave.x86_64-linux
python310Packages.dependency-injector.x86_64-linux
python310Packages.farm-haystack.x86_64-linux
python310Packages.flask-security-too.x86_64-linux
python310Packages.ha-mqtt-discoverable.x86_64-linux
python310Packages.huum.x86_64-linux
python310Packages.labelbox.x86_64-linux
python310Packages.linear_operator.x86_64-linux
python310Packages.maison.x86_64-linux
python310Packages.pgmpy.x86_64-linux
python310Packages.pycfmodel.x86_64-linux
python310Packages.pyngo.x86_64-linux
python310Packages.pytraccar.x86_64-linux
python310Packages.pytradfri.x86_64-linux
python310Packages.qcs-api-client.x86_64-linux
python310Packages.radios.x86_64-linux
python310Packages.shazamio.x86_64-linux
python310Packages.sqlglot.x86_64-linux
python310Packages.steamship.x86_64-linux
python310Packages.withings-api.x86_64-linux
python310Packages.xbox-webapi.x86_64-linux
python311Packages.bentoml.x86_64-linux
python311Packages.correctionlib.x86_64-linux
python311Packages.dbt-semantic-interfaces.x86_64-linux
python311Packages.deepwave.x86_64-linux
python311Packages.dependency-injector.x86_64-linux
python311Packages.farm-haystack.x86_64-linux
python311Packages.flask-security-too.x86_64-linux
python311Packages.ha-mqtt-discoverable.x86_64-linux
python311Packages.huum.x86_64-linux
python311Packages.labelbox.x86_64-linux
python311Packages.linear_operator.x86_64-linux
python311Packages.maison.x86_64-linux
python311Packages.pgmpy.x86_64-linux
python311Packages.pycfmodel.x86_64-linux
python311Packages.pyngo.x86_64-linux
python311Packages.pytraccar.x86_64-linux
python311Packages.pytradfri.x86_64-linux
python311Packages.radios.x86_64-linux
python311Packages.shazamio.x86_64-linux
python311Packages.steamship.x86_64-linux
python311Packages.withings-api.x86_64-linux
python311Packages.xbox-webapi.x86_64-linux

mweinelt · 2023-11-25T20:37:10Z

Wondering if we want to provide pydantic_1 for the time being, so we don't accumulate various unmaintained overrides.

natsukium · 2023-11-26T02:57:34Z

Wondering if we want to provide pydantic_1 for the time being, so we don't accumulate various unmaintained overrides.

for application?

mweinelt · 2023-11-28T18:59:24Z

Looked at home-assistant and frigate, and it gets messy fast. I can upgrade frigate to 0.13.0rc6, but for home-assistant I don't think we can fix things without breaking something else.

dotlambda · 2023-11-28T19:24:53Z

for home-assistant I don't think we can fix things without breaking something else

How many overrides would we need to fix home-assistant?

mweinelt · 2023-11-28T19:46:33Z

Downgrade of aionotion and aiopurpleair, as well as fastapi, which for tests depends on pydantic-settings and pydantic-extra-types, which require pydantic>=2, and this is where I stopped.

commit 222c86ea948b8454314410f76ac05e64ea444e41 (HEAD -> pydantic2)
Author: Martin Weinelt <hexa@darmstadt.ccc.de>
Date:   Tue Nov 28 19:49:23 2023 +0100

    home-assistant: pin pydantic_1
    
    and downgrade
    - aionotion to 2023.05.5
    - aiopurpleair 2022.12.1

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 8f5768fbd2c1..f682cfcf0492 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -50,6 +50,31 @@ let
         };
       });
 
+      aionotion = super.aionotion.overridePythonAttrs (old: rec {
+        version = "2023.05.5";
+        src = fetchFromGitHub {
+          owner = "bachya";
+          repo = "aionotion";
+          rev = "refs/tags/${version}";
+          hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o=";
+        };
+      });
+
+      aiopurpleair = super.aiopurpleair.overridePythonAttrs (old: rec {
+        version = "2022.12.1";
+        src = fetchFromGitHub {
+          owner = "bachya";
+          repo = "aiopurpleair";
+          rev = "refs/tags/${version}";
+          hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk=";
+        };
+        postPatch = ''
+          substituteInPlace pyproject.toml --replace \
+            '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \
+            '"poetry-core"'
+        '';
+      });
+
       aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec {
         version = "0.1.1";
         src = fetchFromGitHub {
@@ -201,6 +226,8 @@ let
         };
       });
 
+      pydantic = super.pydantic_1;
+
       py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec {
         version = "2.1.4";
         src = fetchFromGitHub {

natsukium · 2023-11-29T04:35:53Z

I tried adding a conditional branch to fastapi for in case of pydantic override, and it might work.

commit b27a86adf0c7c3b5e726cb2022214a9bf9a5f4d6
Author: natsukium <tomoya.otabi@gmail.com>
Date:   Tue Nov 28 22:33:12 2023 +0900

    fixup! python311Packages.fastapi: add optional-dependencies for pydantic 2

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 3b4d31e59522..f311c9cc92e7 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -69,6 +69,7 @@ buildPythonPackage rec {
     orjson
     email-validator
     uvicorn
+  ] ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [
     pydantic-settings
     pydantic-extra-types
   ] ++ uvicorn.optional-dependencies.standard;

natsukium · 2023-11-29T06:30:28Z

@mweinelt Since aionotion and aiopurpleair are the packages whose main consumer is home-assistant, I have reverted the update. I applied a patch for v1 and v2 support instead.
frigate should be able to build now. (Unfortunately, we need to rebuild tensorflow.😟)

mweinelt · 2023-11-29T16:39:24Z

Frigate is fine. Will check on home-assistant in a bit.

Unfortunately, we need to rebuild tensorflow.😟

✔ tensorflow-2.13.0 ⏱ 2h42m18s

😢

Diff: rstcheck/rstcheck-core@refs/tags/v1.0.3...v1.2.0 Changelog: https://github.com/rstcheck/rstcheck-core/blob/v1.2.0/CHANGELOG.md

Diff: OpenXbox/xbox-webapi-python@v2.0.11...v2.1.0 Changelog: https://github.com/OpenXbox/xbox-webapi-python/blob/v2.1.0/CHANGELOG.md

Diff: khoj-ai/khoj@refs/tags/0.3.0...1.0.1 Changelog: https://github.com/debanjum/khoj/releases/tag/1.0.1

The last version to support pydantic 1.x.

natsukium · 2023-12-02T06:58:59Z

@mweinelt It's ready to be merged into python-updates.

mweinelt · 2023-12-02T15:40:58Z

Thank you for working that out!

hongquan · 2024-01-04T08:34:10Z

You can mark pyngo as completed.

pkgs/development/python-modules/pydantic/default.nix

github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Nov 24, 2023

ofborg bot requested review from DeeUnderscore, arianvp, cpcloud, elohmeier, fabaff, mweinelt and wd15 November 24, 2023 13:53

SuperSandro2000 reviewed Nov 24, 2023

View reviewed changes

pkgs/development/python-modules/pydantic/default.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Nov 24, 2023

View reviewed changes

pkgs/development/python-modules/pydantic/default.nix Outdated Show resolved Hide resolved

natsukium mentioned this pull request Nov 25, 2023

Package request: pydantic_2 #263228

Closed

ofborg bot requested review from Izorkin and SomeoneSerge November 25, 2023 09:49

ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 28, 2023

This comment was marked as outdated.

Sign in to view

natsukium and others added 17 commits December 2, 2023 15:54

python311Packages.rstcheck-core: 1.0.3 -> 1.2.0

0ee01ad

Diff: rstcheck/rstcheck-core@refs/tags/v1.0.3...v1.2.0 Changelog: https://github.com/rstcheck/rstcheck-core/blob/v1.2.0/CHANGELOG.md

python311Packages.strawberry-graphql: fix test with pydantic>=2

ce12f6b

python311Packages.strawberry-graphql: fix darwin sandbox build

4ae5ff6

python311Packages.xbox-webapi: 2.0.11 -> 2.1.0

395e37f

Diff: OpenXbox/xbox-webapi-python@v2.0.11...v2.1.0 Changelog: https://github.com/OpenXbox/xbox-webapi-python/blob/v2.1.0/CHANGELOG.md

cloudflare-dyndns: pin pydantic_1

cf3b676

flare-floss: pin pydantic_1

44dfa42

khoj: 0.3.0 -> 1.0.1

152eb42

Diff: khoj-ai/khoj@refs/tags/0.3.0...1.0.1 Changelog: https://github.com/debanjum/khoj/releases/tag/1.0.1

octoprint: pin pydantic_1

e940288

remote-exec: pin pydantic_1

f2417e3

stacs: pin pydantic_1

01fc305

python311Packages.aiopurpleair: apply patch for pydantic>=2

d305cd4

python311Packages.aionotion: apply patch for pydantic>=2

cc85f24

python311Packages.aionotion: add meta.changelog

1f5eb93

frigate: pin pydantic_1

1a4f525

home-assistant: pin pydantic_1

a2ae17c

home-assistant: pin versioningit at 2.2.0

8b4922f

The last version to support pydantic 1.x.

treewide: marke as broken due to incompatibility with pydantic>=2

5395d9c

natsukium force-pushed the pydantic2 branch from a11734d to 5395d9c Compare December 2, 2023 06:55

natsukium marked this pull request as ready for review December 2, 2023 06:56

mweinelt merged commit 8b197a5 into NixOS:python-updates Dec 2, 2023

natsukium deleted the pydantic2 branch December 2, 2023 15:42

soispha mentioned this pull request Dec 7, 2023

Package request: manim-slides #251914

Closed

eclairevoyant mentioned this pull request Dec 30, 2023

Build failure: python3Packages.pydantic-extra-types #277650

Closed

SomeoneSerge reviewed Jan 8, 2024

View reviewed changes

pkgs/development/python-modules/pydantic/default.nix Show resolved Hide resolved

This was referenced Jan 22, 2024

python311Packages.demetriek: relax pydantic #282421

Merged

python311Packages.betterproto: disable failing pydantic tests #281994

Merged

brrrocking mentioned this pull request Feb 12, 2024

tribler: deps pin pydantic_1 #288293

Merged

13 tasks

Uh oh!

Conversation

natsukium commented Nov 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Things done

Priorities

Eval reports

Known issue

Uh oh!

Uh oh!

Uh oh!

augustebaum commented Nov 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mweinelt commented Nov 25, 2023

Uh oh!

mweinelt commented Nov 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mweinelt commented Nov 25, 2023

Uh oh!

natsukium commented Nov 26, 2023

Uh oh!

mweinelt commented Nov 28, 2023

Uh oh!

dotlambda commented Nov 28, 2023

Uh oh!

mweinelt commented Nov 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

natsukium commented Nov 29, 2023

Uh oh!

natsukium commented Nov 29, 2023

Uh oh!

mweinelt commented Nov 29, 2023

Uh oh!

This comment was marked as outdated.

natsukium commented Dec 2, 2023

Uh oh!

mweinelt commented Dec 2, 2023

Uh oh!

hongquan commented Jan 4, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

natsukium commented Nov 24, 2023 •

edited

Loading

augustebaum commented Nov 25, 2023 •

edited

Loading

mweinelt commented Nov 25, 2023 •

edited

Loading

mweinelt commented Nov 28, 2023 •

edited

Loading