From a0ed2482e488b12546014811383d17bab5c78892 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 5 Dec 2025 15:40:35 +0000 Subject: [PATCH] gnu: python-pydantic-2: Deprecate by python-pydantic. * gnu/packages/python-xyz.scm (python-pydantic-2): Deprecate variable. * gnu/packages/astronomy.scm (python-czml3, python-edps, python-hvpy): [propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/cybersecurity.scm (gallia): [inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/databases.scm (python-prisma)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. (python-tortoise-orm, aerich)[native-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/django.scm (python-django-ninja)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/finance.scm (python-schwifty)[native-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/games.scm (tuxemon)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/machine-learning.scm (python-spacy, python-thinc): [propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/maths.scm (python-libensemble)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/python-check.scm (python-inline-snapshot)[native-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/python-science.scm (python-iminuit):[native-inputs]: Remove python-pydantic-2; add python-pydantic. (python-pandera, python-vaex-core)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/python-web.scm: (python-cloudpathlib, python-huggingface-hub): [native-inputs]: Remove python-pydantic-2; add python-pydantic. (python-aws-sam-translator, python-weasel, python-openai, python-fastapi, python-fastapi-csrf-protect, python-fastapi-pagination-minimal, python-fastapi-pagination): [propagated-inputs]: Remove python-pydantic-2; add python-pydantic. * gnu/packages/python-xyz.scm: (python-safety-schemas, python-pytoolconfig, python-pydantic-cli, python-pydantic-settings, python-confection, python-safety)[propagated-inputs]: Remove python-pydantic-2; add python-pydantic. (python-deepdiff, python-lief)[native-inputs]: Remove python-pydantic-2; add python-pydantic. Change-Id: I20842162ae8a6c0abd54e4ef1fc676f928541184 Signed-off-by: Rutherther --- gnu/packages/astronomy.scm | 6 ++-- gnu/packages/cybersecurity.scm | 2 +- gnu/packages/databases.scm | 6 ++-- gnu/packages/django.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/machine-learning.scm | 4 +-- gnu/packages/maths.scm | 2 +- gnu/packages/protobuf.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-science.scm | 6 ++-- gnu/packages/python-web.scm | 18 +++++------ gnu/packages/python-xyz.scm | 51 ++++++------------------------- 13 files changed, 37 insertions(+), 68 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d9ade1ea96a2a73d50a18c4a6cbefc54d30600cb..d72dce8a8209e0ae659c5f8a13798c8828e5ab01 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -4265,7 +4265,7 @@ Observatory}.") (propagated-inputs (list python-dateutil python-numpy - python-pydantic-2 + python-pydantic python-strenum python-typing-extensions python-w3lib)) @@ -4546,7 +4546,7 @@ implemented using the astropy.modeling framework.") python-tinydb python-frozendict python-jinja2 - python-pydantic-2 + python-pydantic python-psutil)) (home-page "https://www.eso.org/sci/software/edps.html") (synopsis "ESO's Data Processing System") @@ -5600,7 +5600,7 @@ observationally-derived galaxy merger catalogs.") python-setuptools python-wheel)) (propagated-inputs - (list python-pydantic-2 + (list python-pydantic python-pydantic-settings python-requests)) (home-page "https://helioviewer.org/") diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index d196cc124bc1245400fa64a2ad0fd52873e72778..b49b143df967f127add69e03da7202d1494e7617 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -147,7 +147,7 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.") python-msgspec python-platformdirs python-psutil - python-pydantic-2 + python-pydantic python-pygit2 python-tabulate python-zstandard)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b0c4cc30889c56803e7e2094c46971ab832907f6..2ee7ca2e7cdc8d914453279c2aa00f7fa38be0b4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -837,7 +837,7 @@ they exist.") python-httpx python-jinja2 python-nodeenv - python-pydantic-2 + python-pydantic python-tomlkit python-typing-extensions)) (home-page "https://github.com/RobertCraigie/prisma-client-py") @@ -3918,7 +3918,7 @@ of PyMySQL. @code{aiomysql} tries to preserve the same API as the python-poetry-core python-psycopg python-psycopg-pool - python-pydantic-2 + python-pydantic python-pyodbc python-pytest)) (propagated-inputs @@ -3990,7 +3990,7 @@ similarity distances for scementic search using embeddings.") (native-inputs (list python-cryptography python-pdm-backend - python-pydantic-2 + python-pydantic python-pydantic-settings python-pytest python-pytest-asyncio diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index ed99418723381cf1640a7185789ca9ebf13893dc..a44ffb5d1ba81dc6555262dcaf950ac592df78f4 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1097,7 +1097,7 @@ entries, photos, book chapters, or anything else.") "0f5hgjkavvk1csb1yl34scqai3ljjhh93k5kbqm8s8hclry4fvg4")))) (build-system pyproject-build-system) (propagated-inputs - (list python-django python-pydantic-2)) + (list python-django python-pydantic)) (native-inputs (list python-flit-core python-psycopg2 diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ce46cb94959e1165d45dd7e19bc9d84e929be8e4..1c853303797727d2847858fa13ab934d256a7240 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1584,7 +1584,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.") (base32 "16d0q1yzrh9fn6ybbsvhr9wbgld27rvn152w4wdcibidq2jbi0s2")))) (build-system pyproject-build-system) (native-inputs (list python-hatchling python-hatch-vcs python-pytest - python-pydantic-2)) + python-pydantic)) (propagated-inputs (list python-importlib-resources python-pycountry python-rstr python-typing-extensions)) (home-page "http://github.com/mdomke/schwifty/") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 648608438d24847de22c833af0b40df5aba9641b..3a1fa3355ea785aa5a11290b2ec7ed64a8706c37 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6699,7 +6699,7 @@ safety of the Chromium vessel.") python-pytmx python-pillow python-prompt-toolkit - python-pydantic-2 + python-pydantic python-pygame-menu python-pyyaml python-requests)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 62cd8a5f06c92a5d1ca85d7f4be5e22c6f9b01a3..5b0ac95cb5ee93b8c6f3d9bb7d0fce80bed5bb5a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1603,7 +1603,7 @@ natural language processing framework.") python-numpy python-packaging python-preshed - python-pydantic-2 + python-pydantic python-requests python-spacy-legacy python-spacy-loggers @@ -2280,7 +2280,7 @@ and are compatible with its API.") python-numpy python-packaging python-preshed - python-pydantic-2 + python-pydantic python-setuptools python-srsly python-wasabi)) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8bbbf89d11495dec40a73802ced8913c91fd597b..b456638ec9fbce16d0c9e67566e557adaca58233 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4571,7 +4571,7 @@ savings are consistently > 5x.") (propagated-inputs (list python-mpmath python-numpy python-psutil - python-pydantic-2 + python-pydantic python-pyyaml python-tomli)) (home-page "https://github.com/Libensemble/libensemble") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 8b3606654c1e334829f56095de8f402deb3608e0..4147a6bd663bc40ed9143c1058454fe544a70001 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -601,7 +601,7 @@ mechanism for serializing structured data.") (native-inputs (list python-poetry-core python-poetry-dynamic-versioning - python-pydantic-2 + python-pydantic python-pytest python-pytest-benchmark python-pytest-cov)) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index ccadace622a772c293c38373c67edfcab797c003..c441b11bee12361a8e2f2c334946493f0f6323ae 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1407,7 +1407,7 @@ to establish class invariants.") python-freezegun python-hatchling python-hypothesis - python-pydantic-2 + python-pydantic python-pytest-bootstrap python-pytest-freezer python-pytest-mock diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 139780f5bb97d34b074255e81d0431d908bc25d1..f4a30aeec66a84963c58fab9a53ffb93c4816976 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1607,7 +1607,7 @@ Features: python-ipykernel python-jacobi python-joblib - python-pydantic-2 + python-pydantic python-pytest python-resample python-scikit-build-core @@ -4329,7 +4329,7 @@ idea of the remaining amount of computation to be done.") python-shapely)) (propagated-inputs (list python-packaging - python-pydantic-2 + python-pydantic python-typeguard python-typing-extensions python-typing-inspect)) @@ -4850,7 +4850,7 @@ readable.") python-pandas python-progressbar2 python-pyarrow - python-pydantic-2 + python-pydantic python-pydantic-settings python-pyyaml python-requests diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2fefcabb35adcfb89d4e8749813deca985984877..28b9a21b23744c558e1f16f437e91b4813fd50e7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -433,7 +433,7 @@ and JSON. (list ;; python-azure-identity python-dotenv python-flit-core - python-pydantic-2 + python-pydantic python-pytest python-pytest-cases python-pytest-xdist @@ -1357,7 +1357,7 @@ of a fake DNS resolver.") python-mypy python-numpy python-pillow - python-pydantic-2 + python-pydantic python-pytest python-pytest-asyncio python-pytest-cov @@ -2611,7 +2611,7 @@ routes using HTTP Digest Authentication.") (propagated-inputs (list python-boto3 python-jsonschema - python-pydantic-2 + python-pydantic python-typing-extensions)) (home-page "https://github.com/aws/serverless-application-model") (synopsis "Transform AWS SAM templates into AWS CloudFormation templates") @@ -4621,7 +4621,7 @@ with very acceptable performance.") (list python-cloudpathlib python-confection python-packaging - python-pydantic-2 + python-pydantic python-requests python-smart-open python-srsly @@ -4765,7 +4765,7 @@ service.") (list python-aiohttp python-distro python-httpx - python-pydantic-2 + python-pydantic python-requests python-tqdm python-typing-extensions)) @@ -13167,7 +13167,7 @@ Amazon S3 or any other external service.") python-jinja2 python-multipart python-orjson - python-pydantic-2 + python-pydantic python-pydantic-settings python-pyyaml python-starlette @@ -13204,7 +13204,7 @@ starlette.") (build-system pyproject-build-system) (propagated-inputs (list python-fastapi python-itsdangerous - python-pydantic-2)) + python-pydantic)) (native-inputs (list python-poetry-core python-pytest)) @@ -13235,7 +13235,7 @@ pattern.") ;; These are the only required dependencies, ;; please add all optional dependencies to the ;; full python-fastapi-pagination below. - (propagated-inputs (list python-fastapi python-pydantic-2)) + (propagated-inputs (list python-fastapi python-pydantic)) (native-inputs (list python-poetry-core)) (home-page "https://github.com/uriyyo/fastapi-pagination") (synopsis "FastAPI pagination library") @@ -13278,7 +13278,7 @@ return paginated responses to your clients.") python-databases python-django python-fastapi - python-pydantic-2 + python-pydantic python-sqlalchemy (package (inherit python-tortoise-orm) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c5f262c9a1ae33f424185afac4a4b0f97b9dc22d..559bfdfb167ed150d3951bf60b927bfc0d951105 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2190,7 +2190,7 @@ reused when throttling user interactions with a resource (e.g., an API).") " and not ")))) (propagated-inputs (list python-dparse python-packaging - python-pydantic-2 + python-pydantic python-ruamel.yaml python-typing-extensions)) (native-inputs (list python-deepdiff python-hatchling python-pytest)) @@ -3991,7 +3991,7 @@ implementation for the Telegram Bot API.") (build-system pyproject-build-system) (propagated-inputs (list python-packaging python-platformdirs - python-pydantic-2 + python-pydantic python-sphinx python-sphinx-autodoc-typehints python-sphinx-rtd-theme @@ -10135,39 +10135,8 @@ errors when data is invalid.") (propagated-inputs (list python-typing-extensions)))) -(define-public python-pydantic-2 - (package - (inherit python-pydantic) - (name "python-pydantic") - (version "2.10.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pydantic" version)) - (sha256 - (base32 "01jg4ll2py05izm7s9hlv5xbxcsp26bvb2585gzf8vfs4fbjxwc2")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - #~(list "--ignore=tests/test_docs.py" ; no pytest_examples - "--ignore-glob=tests/benchmarks/*" - ;; Unimportant difference in one test's error message. - "--ignore=tests/test_networks.py"))) - (native-inputs - (list tzdata-for-tests - python-dirty-equals - python-hatch-fancy-pypi-readme - python-hatchling - python-jsonschema - python-pytest - python-pytest-benchmark - python-pytest-mock)) - (propagated-inputs - (list python-annotated-types - python-pydantic-core - python-rich - python-typing-extensions)))) +;; It may be removed after 2026-01-05. +(define-deprecated/public-alias python-pydantic-2 python-pydantic) (define-public python-pydantic-core (package @@ -10258,7 +10227,7 @@ validation and serialization.") "1rfffz4kasjihys8qgnvjb8cwm0dycsdj7qnggi9372b9q1ng4zg")))) (build-system pyproject-build-system) (propagated-inputs - (list python-pydantic-2)) + (list python-pydantic)) (native-inputs (list python-hatchling python-pytest)) (home-page "https://github.com/mpkocher/pydantic-cli") @@ -10318,7 +10287,7 @@ Interfaces} via data models provided in the JSON format.") ;; '/homeless-shelter/ (setenv "HOME" "/tmp")))))) (propagated-inputs - (list python-dotenv python-pydantic-2)) + (list python-dotenv python-pydantic)) (native-inputs (list python-hatchling python-pytest @@ -19104,7 +19073,7 @@ allows one to make simple text-mode user interfaces on Unix-like systems") (base32 "03hgb6601mx6iip4nr8i0is8x5vmh85z286j7j8lhkxxlqydswlf")))) (build-system pyproject-build-system) - (propagated-inputs (list python-pydantic-2 python-srsly)) + (propagated-inputs (list python-pydantic python-srsly)) (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://github.com/explosion/confection") (synopsis "Config system for Python") @@ -31318,7 +31287,7 @@ facility for filtering those results.") python-nltk python-packaging python-psutil - python-pydantic-2 + python-pydantic python-requests python-ruamel.yaml python-safety-schemas @@ -35134,7 +35103,7 @@ object, which can be useful if you want to force your objects into a table.") python-jsonpickle python-numpy python-pandas - python-pydantic-2 + python-pydantic python-pytest python-pytest-benchmark python-pytz @@ -35970,7 +35939,7 @@ platform using the ActivityPub protocol.") (native-inputs (list cmake-minimal ninja python-scikit-build-core - python-pydantic-2)) + python-pydantic)) (arguments (list #:tests? #f ;needs network