From 4d92b1c73e7d240ef64c7fda7648ce46eb70f932 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 1 Nov 2025 16:50:31 +0100 Subject: [PATCH] gnu: python-packaging: Move to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-packaging): Move from here ... * gnu/packages/python-build.scm (python-packaging): ... to here. Overwrite original python-packaging-bootstrap and swap inheritance. Change-Id: If244d390b7ec3e526dccba28023f6f5350346f01 Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-build.scm | 24 ++++++++++++++++++------ gnu/packages/python-xyz.scm | 25 ------------------------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 261b52a9d75..df66b1bafe3 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -657,9 +657,9 @@ of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code.") (license license:expat))) -(define-public python-packaging-bootstrap +(define-public python-packaging (package - (name "python-packaging-bootstrap") + (name "python-packaging") (version "25.0") (source (origin @@ -668,20 +668,32 @@ that client code uses to construct the grammar directly in Python code.") (sha256 (base32 "0kzwn2ar4ndm90qrvgyjcbkqz3klrg0ziwm1yrhbyxynk0n8fhyl")))) (build-system pyproject-build-system) - (arguments `(#:tests? #f)) ;disabled to avoid extra dependencies (native-inputs - (list python-flit-core)) + (list python-flit-core + python-pretend + python-pytest-bootstrap)) + (propagated-inputs (list python-pyparsing python-six)) (home-page "https://github.com/pypa/packaging") (synopsis "Core utilities for Python packages") (description "Packaging is a Python module for dealing with Python packages. -It offers an interface for working with package versions, names, and dependency -information.") + It offers an interface for working with package versions, names, and dependency + information.") ;; From 'LICENSE': This software is made available under the terms of ;; *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD. ;; Contributions to this software is made under the terms of *both* these ;; licenses. (license (list license:asl2.0 license:bsd-2)))) +(define-public python-packaging-bootstrap + (package/inherit python-packaging + (name "python-packaging-bootstrap") + (arguments + ;; XXX: disabled to avoid extra dependencies + (list + #:tests? #f)) + (native-inputs (list python-flit-core)) + (propagated-inputs '()))) + (define-public python-pretend (package (name "python-pretend") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6e158e70dc..40ec93e1486 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25055,31 +25055,6 @@ spoken MP3 data to a file, a file-like object (bytestring) for further audio manipulation, or @code{stdout}.") (license license:expat))) -(define-public python-packaging - (package/inherit python-packaging-bootstrap - (name "python-packaging") - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (invoke "pytest" "-vv") - (format #t "test suite not run~%"))))))) - (native-inputs - (list python-flit-core - python-pretend python-pytest)) - (propagated-inputs (list python-pyparsing python-six)) - (home-page "https://github.com/pypa/packaging") - (synopsis "Core utilities for Python packages") - (description "Packaging is a Python module for dealing with Python packages. - It offers an interface for working with package versions, names, and dependency - information.") - ;; From 'LICENSE': This software is made available under the terms of - ;; *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD. - ;; Contributions to this software is made under the terms of *both* these - ;; licenses. - (license (list license:asl2.0 license:bsd-2)))) - (define-public python-packaging-legacy (package (name "python-packaging-legacy")