~ruther/guix-local

a0ed2482e488b12546014811383d17bab5c78892 — Sharlatan Hellseher 7 months ago c3aefeb
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 <rutherther@ditigal.xyz>
M gnu/packages/astronomy.scm => gnu/packages/astronomy.scm +3 -3
@@ 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/")

M gnu/packages/cybersecurity.scm => gnu/packages/cybersecurity.scm +1 -1
@@ 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))

M gnu/packages/databases.scm => gnu/packages/databases.scm +3 -3
@@ 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

M gnu/packages/django.scm => gnu/packages/django.scm +1 -1
@@ 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

M gnu/packages/finance.scm => gnu/packages/finance.scm +1 -1
@@ 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/")

M gnu/packages/games.scm => gnu/packages/games.scm +1 -1
@@ 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))

M gnu/packages/machine-learning.scm => gnu/packages/machine-learning.scm +2 -2
@@ 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))

M gnu/packages/maths.scm => gnu/packages/maths.scm +1 -1
@@ 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")

M gnu/packages/protobuf.scm => gnu/packages/protobuf.scm +1 -1
@@ 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))

M gnu/packages/python-check.scm => gnu/packages/python-check.scm +1 -1
@@ 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

M gnu/packages/python-science.scm => gnu/packages/python-science.scm +3 -3
@@ 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

M gnu/packages/python-web.scm => gnu/packages/python-web.scm +9 -9
@@ 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)

M gnu/packages/python-xyz.scm => gnu/packages/python-xyz.scm +10 -41
@@ 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