From 15f05a888f0e8a42eaeab28db7dc8c7e0ba13f05 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sun, 19 Oct 2025 15:26:30 +0200 Subject: [PATCH] gnu: Deprecate python-path-bootstrap in favor of python-path. * gnu/packages/python-xyz.scm (python-path-bootstrap): Deprecate variable, which is not necessary anymore, was hidden, and is not used. (python-pathpy): Switch to DEFINE-DEPRECATED/PUBLIC-ALIAS. (python-path): Rewrite it without inheritance. Change-Id: I95647b7a12ddede97846ffcc89793855fac8beea Modified-by: Sharlatan Hellseher Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-xyz.scm | 85 ++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 49 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 123f9fa3d4495a202dbe8174f7bd209642ecd98f..b85196e7b830922a73a855ada753e4441199ab11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18321,59 +18321,46 @@ is binding LibSass.") @code{ssl} module. It patches @code{ssl.match_hostname} for that purpose.") (license license:expat))) -;;; Variant used to break a cycle with python-pip-run-bootstrap. -(define-public python-path-bootstrap - (hidden-package - (package - (name "python-path-bootstrap") - (version "17.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "path" version)) - (sha256 - (base32 "1scqbwgcbisx8mb28hw789a7np953851wg6z0bbzdm519znha7nl")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) - (native-inputs (list python-setuptools python-setuptools-scm python-wheel)) - (home-page "https://github.com/jaraco/path") - (synopsis "Object-oriented file system path manipulation library") - (description "@code{path} (formerly @code{path.py}) implements path -objects as first-class entities, allowing common operations on files to be -invoked on those path objects directly.") - (license license:expat)))) - (define-public python-path - (package/inherit python-path-bootstrap + (package (name "python-path") + (version "17.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "path" version)) + (sha256 + (base32 "1scqbwgcbisx8mb28hw789a7np953851wg6z0bbzdm519znha7nl")))) + (build-system pyproject-build-system) (arguments - (substitute-keyword-arguments - (package-arguments python-path-bootstrap) - ((#:tests? _ #f) - (not (%current-target-system))) - ((#:test-flags flags #~'()) - #~(append (list "-k" - (string-append - ;; Do not test the myproject.toml build as it tries - ;; to pull dependencies from the Internet. - "not project " - ;; This tests assumes a root user exists. - "and not test_get_owner")) - #$flags)))) - (native-inputs - (modify-inputs (package-native-inputs python-path-bootstrap) - (append python-appdirs - python-more-itertools - python-packaging - python-pygments - python-pytest))) - (properties (alist-delete 'hidden? - (package-properties - python-path-bootstrap))))) + (list + #:tests? (not (%current-target-system)) + #:test-flags + #~(list "-k" + (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the Internet. + "not project " + ;; This tests assumes a root user exists. + "and not test_get_owner")))) + (native-inputs + (list python-appdirs + python-more-itertools + python-packaging + python-pygments + python-pytest + python-setuptools + python-setuptools-scm)) + (home-page "https://github.com/jaraco/path") + (synopsis "Object-oriented file system path manipulation library") + (description "@code{path} (formerly @code{path.py}) implements path +objects as first-class entities, allowing common operations on files to be +invoked on those path objects directly.") + (license license:expat))) -(define-deprecated-package python-pathpy - python-path) +;; It may be removed after 2026-01-24. +(define-deprecated/public-alias python-path-bootstrap python-path) +(define-deprecated/public-alias python-pathpy python-path) (define-public python-pretend (package