diff options
author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-11-22 18:27:32 +0000 |
---|---|---|
committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-12-13 20:23:29 +0000 |
commit | b0b7fc0484d84885bde88e70ac4f429139a0188b (patch) | |
tree | 11594344524018f8876cbcdaccf74dfc21636bb4 | |
parent | 10af55b09323a05fa9c473715bcabf1bec3ef6ea (diff) | |
download | guix-b0b7fc0484d84885bde88e70ac4f429139a0188b.tar.gz guix-b0b7fc0484d84885bde88e70ac4f429139a0188b.zip |
gnu: python-typeguard: Update to 4.4.1.
* gnu/packages/python-xyz.scm (python-typeguard): Update to 4.4.1.
[build-system]: Swap to pyproject-build-system.
[arguments]<phases>: Use default 'check phase.
[propagated-inputs]: Add python-typing-extensions.
[native-inputs]: Add python-setuptools and python-wheel.
* gnu/packages/patches/python-typeguard-python3.10.patch: Delete file.
gnu/local.mk: Deregister patch.
Change-Id: Ibabc0645b4a6192614d714036fcba1f337924305
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/patches/python-typeguard-python3.10.patch | 47 | ||||
-rw-r--r-- | gnu/packages/python-xyz.scm | 31 |
3 files changed, 12 insertions, 67 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3925fb3afb..312d3340e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1953,7 +1953,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ %D%/packages/patches/python-sphobjinv-defer-ssl-import.patch \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ - %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ diff --git a/gnu/packages/patches/python-typeguard-python3.10.patch b/gnu/packages/patches/python-typeguard-python3.10.patch deleted file mode 100644 index 29321d8918..0000000000 --- a/gnu/packages/patches/python-typeguard-python3.10.patch +++ /dev/null @@ -1,47 +0,0 @@ -Taken from Gentoo, which adapted -https://github.com/agronholm/typeguard/commit/e0db07a777d5a481eaba6162354adf32286ce21b - -diff --git a/src/typeguard/__init__.py b/src/typeguard/__init__.py -index 5684d63..27fa30b 100644 ---- a/src/typeguard/__init__.py -+++ b/src/typeguard/__init__.py -@@ -61,22 +61,25 @@ except ImportError: - from typing import _ForwardRef as ForwardRef - evaluate_forwardref = ForwardRef._eval_type - --if sys.version_info >= (3, 10): -- from typing import is_typeddict --else: -- _typed_dict_meta_types = () -- if sys.version_info >= (3, 8): -- from typing import _TypedDictMeta -- _typed_dict_meta_types += (_TypedDictMeta,) -+try: -+ from typing_extensions import is_typeddict -+except ImportError: -+ if sys.version_info >= (3, 10): -+ from typing import is_typeddict -+ else: -+ _typed_dict_meta_types = () -+ if sys.version_info >= (3, 8): -+ from typing import _TypedDictMeta -+ _typed_dict_meta_types += (_TypedDictMeta,) - -- try: -- from typing_extensions import _TypedDictMeta -- _typed_dict_meta_types += (_TypedDictMeta,) -- except ImportError: -- pass -+ try: -+ from typing_extensions import _TypedDictMeta -+ _typed_dict_meta_types += (_TypedDictMeta,) -+ except ImportError: -+ pass - -- def is_typeddict(tp) -> bool: -- return isinstance(tp, _typed_dict_meta_types) -+ def is_typeddict(tp) -> bool: -+ return isinstance(tp, _typed_dict_meta_types) - - - if TYPE_CHECKING: diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3ed37bf6c9..1410f65d29 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27524,30 +27524,23 @@ based on the CPython 2.7 and 3.7 parsers.") (define-public python-typeguard (package (name "python-typeguard") - (version "2.13.3") + (version "4.4.1") (source (origin (method url-fetch) (uri (pypi-uri "typeguard" version)) (sha256 - (base32 "1i5qzcyw2715h1g1hvj7fxykck2bkxyshpngjr3nfcx1lf6smv80")) - (patches (search-patches "python-typeguard-python3.10.patch")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "-k" - ;; XXX: These fail when installed as a library: - ;; https://github.com/agronholm/typeguard/issues/176 - "not usefixtures and not test_cached_module"))))))) - (native-inputs (list python-mypy - python-pytest - python-setuptools-scm - python-typing-extensions)) + (base32 "06y22d1f5dhpyl71wbhsaibig5hvc2v44pw795yb8lxl02fsh8hd")))) + (build-system pyproject-build-system) + (native-inputs + (list python-mypy + python-pytest + python-setuptools + python-setuptools-scm + python-typing-extensions + python-wheel)) + (propagated-inputs + (list python-typing-extensions)) (home-page "https://github.com/agronholm/typeguard") (synopsis "Run-time type checker for Python") (description |