guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit af3df9fe145967ebc85d185d5eda0f826e44d8d9
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Wed Jun 25 19:44:00 2025 +0100
gnu: python-docutils: Update to 0.21.2.
This change updates python-docutils to the latests version and pins some
older packages on 0.19 to resolve build documentation issue which uses
rst2man.
* gnu/packages/python-xyz.scm (python-docutils): Update to 0.21.2.
[build-system]: Use pyproject.
[arguments] <phases>: Do not overwrite 'check use {#:test-backend} and
{#:test-flags}.
[native-inputs]: Add python-flit-core.
(python-docutils-0.16)[native-inputs]: Add python-wheel.
(python-docutils-0.19): New variable.
* gnu/packages/diffoscope.scm (trydiffoscope) [native-inputs]: Remove
python-docutils; add python-docutils-0.19.
* gnu/packages/gtk.scm (gtk): Likewise.
* gnu/packages/linux.scm (rdma-core): Likewise.
* gnu/packages/power.scm (apcupsd): Likewise.
* gnu/packages/version-control.scm (cgit): Likewise.
* gnu/packages/virtualization.scm (ganeti)) Likewise.
Change-Id: If58b9b12732347245e66e3c2cb5e67b0a8450913
---
gnu/packages/diffoscope.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/linux.scm | 2 +-
gnu/packages/power.scm | 2 +-
gnu/packages/python-xyz.scm | 45 ++++++++++++++++++++++++++--------------
gnu/packages/version-control.scm | 2 +-
gnu/packages/virtualization.scm | 2 +-
7 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 7314029c6c..005be166ba 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -376,7 +376,7 @@ them in detail for later analysis.")
(propagated-inputs
(list python-requests))
(native-inputs
- (list gzip python-docutils python-setuptools python-wheel))
+ (list gzip python-docutils-0.19 python-setuptools python-wheel))
(build-system pyproject-build-system)
(home-page "https://try.diffoscope.org";)
(synopsis "Client for remote diffoscope service")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 39e9e6ec73..d229f7827b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1373,7 +1373,7 @@ application suites.")
pkg-config
python-pygobject
;; These python modules are required for building documentation.
- python-docutils
+ python-docutils-0.19
python-jinja2
python-markdown
python-markupsafe
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a96419aadf..172fc666e6 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7944,7 +7944,7 @@ from the ntfs-3g package. It is meant to be used in
initrds.")
(search-input-file
%build-inputs
"/bin/rst2man.py")))))
(native-inputs
- (list pkg-config python-wrapper python-docutils)) ;for 'rst2man'
+ (list pkg-config python-wrapper python-docutils-0.19)) ;for 'rst2man'
(inputs
(list libnl eudev))
(home-page "https://github.com/linux-rdma/rdma-core";)
diff --git a/gnu/packages/power.scm b/gnu/packages/power.scm
index 7ba86b16eb..7be8485449 100644
--- a/gnu/packages/power.scm
+++ b/gnu/packages/power.scm
@@ -126,7 +126,7 @@
(lambda _
(delete-file-recursively
(string-append #$output "/etc/apcupsd")))))))
- (native-inputs (list mandoc pkg-config python-docutils util-linux))
+ (native-inputs (list mandoc pkg-config python-docutils-0.19 util-linux))
(inputs (list libusb libusb-compat))
(home-page "http://www.apcupsd.org";)
(synopsis "Daemon for controlling APC UPSes")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 08cd17c292..b83e2e0982 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8554,21 +8554,20 @@ Google and Numpydoc format.")
(define-public python-docutils
(package
(name "python-docutils")
- (version "0.19")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "docutils" version))
- (sha256
- (base32
- "1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k"))))
- (build-system python-build-system)
+ (version "0.21.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "docutils" version))
+ (sha256
+ (base32 "0vwqzbmzdvwx23myx4cg8s8mdkrqnfxpa9yi7jm2s66z5rrihsrs"))))
+ (build-system pyproject-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (if tests?
- (invoke "python" "test/alltests.py")
- (format #t "test suite not run~%")))))))
+ (list
+ #:test-backend #~'custom
+ #:test-flags #~(list "test/alltests.py")))
+ (native-inputs
+ (list python-flit-core))
(home-page "https://docutils.sourceforge.net/";)
(synopsis "Python Documentation Utilities")
(description
@@ -8596,7 +8595,21 @@ via commands such as @command{rst2man}, as well as
supporting Python code.")
;; tests contain Python 2 syntax.
(arguments '(#:tests? #false))
(native-inputs
- (list python-setuptools))))
+ (list python-setuptools python-wheel))))
+
+(define-public python-docutils-0.19
+ (hidden-package
+ (package
+ (inherit python-docutils)
+ (version "0.19")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "docutils" version))
+ (sha256
+ (base32
+ "1rprvir116g5rz2bgzkzgyn6mv0z8582rz7bgxbpy2y3adkmm69k"))))
+ (native-inputs
+ (list python-setuptools python-wheel)))))
(define-public python-docx
(package
@@ -39938,7 +39951,7 @@ path.")
(native-inputs
(list perl-image-exiftool
python-dateutil
- python-docutils
+ python-docutils-0.19
python-jinja2
python-markdown
python-pillow
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 4817ed8f27..78b4a79761 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1774,7 +1774,7 @@ supports AGit-Flow and lifts the requirement to use a
manifest file.")
bash-minimal
openssl
python
- python-docutils
+ python-docutils-0.19
python-markdown
python-pygments
zlib
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index fbe6c8723d..bdc4ebf41f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1059,7 +1059,7 @@ firmware blobs. You can
("automake" ,automake)
;; For the documentation.
- ("python-docutils" ,python-docutils)
+ ("python-docutils" ,python-docutils-0.19)
("sphinx" ,python-sphinx)
("pandoc" ,pandoc)
("dot" ,graphviz)
