[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx.
From: |
Marius Bakke |
Subject: |
[bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx. |
Date: |
Mon, 13 May 2019 00:12:14 +0200 |
* gnu/packages/bioinformatics.scm (python2-pbcore)[native-inputs]: Change from
PYTHON2-SPHINX to PYTHON-SPHINX.
* gnu/packages/image.scm (vigra)[native-inputs]: Likewise.
* gnu/packages/mail.scm (notmuch)[native-inputs]: Likewise.
* gnu/packages/web.scm (python2-httpretty)[native-inputs]: Likewise. Remove
unnecessary PYTHON2-SPHINX-RTD-THEME.
* gnu/packages/sphinx.scm (sphinx)[properties]: Remove field.
(python2-sphinx, python2-sphinxcontrib-newsfeed,
python2-sphinxcontrib-programoutput, python2-sphinx-gallery,
python2-sphinx-repoze-autointerface, python2-sphinx-alabaster-theme,
python2-sphinx-cloud-sptheme, python2-guzzle-sphinx-theme, python2-sphinx-me,
python2-sphinx-rtd-theme): Remove variables.
---
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/image.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/sphinx.scm | 44 ++-------------------------------
gnu/packages/web.scm | 4 +--
5 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 0685ca966b..0aa9d97617 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4729,7 +4729,7 @@ interrupted by stop codons. OrfM finds and prints these
ORFs.")
("python-h5py" ,python2-h5py)))
(native-inputs
`(("python-nose" ,python2-nose)
- ("python-sphinx" ,python2-sphinx)
+ ("sphinx" ,python-sphinx)
("python-pyxb" ,python2-pyxb)))
(home-page "http://pacificbiosciences.github.io/pbcore/")
(synopsis "Library for reading and writing PacBio data files")
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 528f1dcdcb..443457da43 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -894,7 +894,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and
others.")
(native-inputs
`(("doxygen" ,doxygen)
("python2-nose" ,python2-nose)
- ("python2-sphinx" ,python2-sphinx)))
+ ("sphinx" ,python-sphinx)))
(arguments
`(#:test-target "check"
#:phases
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index aeac81d072..8e3a676ce1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -898,7 +898,7 @@ invoking @command{notifymuch} from the post-new hook.")
("pkg-config" ,pkg-config)
("python" ,python-2)
("python-docutils" ,python2-docutils)
- ("python-sphinx" ,python2-sphinx)
+ ("sphinx" ,python-sphinx)
;; The following are required for tests only.
("which" ,which)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 088f0d3b38..82a0df2499 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -38,8 +38,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages python-web)
- #:use-module (gnu packages python-xyz)
- #:use-module (gnu packages time))
+ #:use-module (gnu packages python-xyz))
(define-public python-sphinx
(package
@@ -94,19 +93,7 @@
(description "Sphinx is a tool that makes it easy to create documentation
for Python projects or other documents consisting of multiple reStructuredText
sources.")
- (license license:bsd-3)
- (properties `((python2-variant . ,(delay python2-sphinx))))))
-
-(define-public python2-sphinx
- (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
- (package
- (inherit base)
- (native-inputs `(("python2-mock" ,python2-mock)
- ("python2-enum34" ,python2-enum34)
- ,@(package-native-inputs base)))
- (propagated-inputs `(("python2-pytz" ,python2-pytz)
- ("python2-typing" ,python2-typing)
- ,@(package-propagated-inputs base))))))
+ (license license:bsd-3)))
(define-public python-sphinxcontrib-newsfeed
(package
@@ -150,9 +137,6 @@ commands into documents, helping you to keep your command
examples up to date.")
(home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput")
(license license:bsd-2)))
-(define-public python2-sphinxcontrib-programoutput
- (package-with-python2 python-sphinxcontrib-programoutput))
-
(define-public python-sphinxcontrib-svg2pdfconverter
(package
(name "python-sphinxcontrib-svg2pdfconverter")
@@ -193,9 +177,6 @@ Sphinx documentation into your web application. It
provides tools to
integrate Sphinx documents in web templates and to handle searches.")
(license license:bsd-3)))
-(define-public python2-sphinxcontrib-websupport
- (package-with-python2 python-sphinxcontrib-websupport))
-
(define-public python-sphinx-gallery
(package
(name "python-sphinx-gallery")
@@ -223,9 +204,6 @@ integrate Sphinx documents in web templates and to handle
searches.")
from any set of Python scripts and puts it into an examples gallery.")
(license license:bsd-3)))
-(define-public python2-sphinx-gallery
- (package-with-python2 python-sphinx-gallery))
-
(define-public python-sphinx-me
(package
(name "python-sphinx-me")
@@ -269,9 +247,6 @@ introspection of @code{zope.interface} instances in code.")
(home-page "https://github.com/repoze/repoze.sphinx.autointerface")
(license license:repoze)))
-(define-public python2-sphinx-repoze-autointerface
- (package-with-python2 python-sphinx-repoze-autointerface))
-
(define-public python-sphinx-alabaster-theme
(package
(name "python-sphinx-alabaster-theme")
@@ -291,9 +266,6 @@ introspection of @code{zope.interface} instances in code.")
theme for the Sphinx documentation system. It's the default theme of Sphinx.")
(license license:bsd-3)))
-(define-public python2-sphinx-alabaster-theme
- (package-with-python2 python-sphinx-alabaster-theme))
-
(define-public python-sphinx-cloud-sptheme
(package
(name "python-sphinx-cloud-sptheme")
@@ -315,9 +287,6 @@ theme for the Sphinx documentation system. It's the
default theme of Sphinx.")
related extensions.")
(license license:bsd-3)))
-(define-public python2-sphinx-cloud-sptheme
- (package-with-python2 python-sphinx-cloud-sptheme))
-
(define-public python-guzzle-sphinx-theme
(package
(name "python-guzzle-sphinx-theme")
@@ -339,9 +308,6 @@ Sphinx documentation system, used by
@uref{http://docs.guzzlephp.org, Guzzle}
and several other projects.")
(license license:expat)))
-(define-public python2-guzzle-sphinx-theme
- (package-with-python2 python-guzzle-sphinx-theme))
-
(define-public python-sphinx-rtd-theme
(package
(name "python-sphinx-rtd-theme")
@@ -361,9 +327,3 @@ and several other projects.")
(synopsis "ReadTheDocs.org theme for Sphinx")
(description "A theme for Sphinx used by ReadTheDocs.org.")
(license license:expat)))
-
-(define-public python2-sphinx-rtd-theme
- (package-with-python2 python-sphinx-rtd-theme))
-
-(define-public python2-sphinx-me
- (package-with-python2 python-sphinx-me))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index fd38a6bf00..3870ca8329 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5228,8 +5228,8 @@ inspired by Ruby's @code{fakeweb}.")
"0vlp5qkyw3pxwwsg7xmdcfh1csvypvaz4m6abida8s4xmjxpdhc3"))))
(build-system python-build-system)
(native-inputs
- `(("python-sphinx-rtd-theme" ,python2-sphinx-rtd-theme)
- ("python-sphinx" ,python2-sphinx)
+ `(("sphinx" ,python-sphinx)
+
("python-coverage" ,python2-coverage)
("python-tornado" ,python2-tornado)
("python-urllib3" ,python2-urllib3)
--
2.21.0
- [bug#35705] [PATCH 0/9] Sphinx 2.0, Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx)., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml, Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx.,
Marius Bakke <=
- [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp., Marius Bakke, 2019/05/12
- [bug#35705] [PATCH 0/9] Sphinx 2.0, Ricardo Wurmus, 2019/05/14
- bug#35705: [PATCH 0/9] Sphinx 2.0, Marius Bakke, 2019/05/25