[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/34: gnu: Remove python2-sphinx.
From: |
guix-commits |
Subject: |
27/34: gnu: Remove python2-sphinx. |
Date: |
Sat, 25 Jul 2020 14:54:04 -0400 (EDT) |
mbakke pushed a commit to branch wip-staging
in repository guix.
commit 45f7dc37c6bbbd334bc2fed8f088f94b32971948
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jul 25 01:12:35 2020 +0200
gnu: Remove python2-sphinx.
* gnu/packages/sphinx.scm (python-sphinx)[properties]: Use self as python2
variant.
(python2-sphinx): Remove variable.
---
gnu/packages/sphinx.scm | 47 +----------------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index f27f9d0..2b8b15f 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -99,52 +99,7 @@
for Python projects or other documents consisting of multiple reStructuredText
sources.")
(license license:bsd-2)
- (properties `((python2-variant . ,(delay python2-sphinx))))))
-
-;; Sphinx 2 does not support Python 2, so we stick with this older version
here.
-;; Remove this package once python2-pbcore no longer requires it.
-(define-public python2-sphinx
- (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
- (package
- (inherit base)
- (version "1.7.7")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "Sphinx" version))
- (sha256
- (base32
- "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-before 'check 'disable-broken-tests
- (lambda _
- ;; These tests are broken when using Python2:
- ;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
- (for-each delete-file '("tests/test_api_translator.py"
- "tests/test_setup_command.py"))
- #t))))))
- (native-inputs `(("python2-mock" ,python2-mock)
- ("python2-enum34" ,python2-enum34)
- ,@(package-native-inputs base)))
- ;; Sphinx 2 has some dependencies that do not support Python 2, so
- ;; we keep our own propagated-inputs here instead of inheriting.
- (propagated-inputs `(("python2-pytz" ,python2-pytz)
- ("python2-typing" ,python2-typing)
- ("python2-imagesize" ,python2-imagesize)
- ("python2-sphinx-alabaster-theme"
- ,python2-sphinx-alabaster-theme)
- ("python2-babel" ,python2-babel-2.6)
- ("python2-snowballstemmer" ,python2-snowballstemmer)
- ("python2-docutils" ,python2-docutils-0.14)
- ("python2-jinja2" ,python2-jinja2)
- ("python2-packaging" ,python2-packaging)
- ("python2-pygments" ,python2-pygments)
- ("python2-requests" ,python2-requests)
- ("python2-six" ,python2-six)
- ("python2-sphinxcontrib-websupport"
- ,python2-sphinxcontrib-websupport))))))
+ (properties `((python2-variant . ,(delay python-sphinx))))))
(define-public python-sphinxcontrib-applehelp
(package
- 22/34: gnu: libva: Update to 2.8.0., (continued)
- 22/34: gnu: libva: Update to 2.8.0., guix-commits, 2020/07/25
- 23/34: gnu: mesa: Update to 20.1.4., guix-commits, 2020/07/25
- 24/34: gnu: python-coverage: Update to 5.2.1., guix-commits, 2020/07/25
- 15/34: gnu: wayland: Update to 1.18.0., guix-commits, 2020/07/25
- 18/34: gnu: libevdev: Update to 1.9.1., guix-commits, 2020/07/25
- 19/34: gnu: xkeyboard-config: Update to 2.30., guix-commits, 2020/07/25
- 20/34: gnu: libvdpau: Update to 1.4., guix-commits, 2020/07/25
- 25/34: gnu: linux-pam: Update to 1.4.0., guix-commits, 2020/07/25
- 26/34: gnu: check: Update to 0.15.1., guix-commits, 2020/07/25
- 30/34: gnu: libical: Disable parallel build., guix-commits, 2020/07/25
- 27/34: gnu: Remove python2-sphinx.,
guix-commits <=
- 31/34: gnu: dconf: Update to 0.36.0., guix-commits, 2020/07/25
- 29/34: gnu: popt: Update to 1.18., guix-commits, 2020/07/25
- 32/34: gnu: alsa-lib: Update to 1.2.3.2., guix-commits, 2020/07/25
- 34/34: gnu: dconf: Increase test timeout., guix-commits, 2020/07/25
- 28/34: gnu: Sphinx: Update to 3.1.2., guix-commits, 2020/07/25
- 33/34: gnu: alsa-utils: Update to 1.2.3., guix-commits, 2020/07/25