* [bug#35705] [PATCH 0/9] Sphinx 2.0
@ 2019-05-12 22:09 Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:09 UTC (permalink / raw)
To: 35705
These patches migrate Sphinx to its own module and updates to 2.0.
Sphinx 2 no longer supports Python 2, so it is removed first.
Note: The last patch is intended for the 'staging' branch.
Marius Bakke (9):
gnu: Move Sphinx and friends to (gnu packages sphinx).
gnu: Remove python2-sphinx.
gnu: Add python-sphinxcontrib-serializinghtml.
gnu: Add python-sphinxcontrib-applehelp.
gnu: Add python-sphinxcontrib-devhelp.
gnu: Add python-sphinxcontrib-jsmath.
gnu: Add python-sphinxcontrib-htmlhelp.
gnu: Add python-sphinxcontrib-qthelp.
gnu: python-sphinx: Update to 2.0.1.
gnu/local.mk | 1 +
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 3 +-
gnu/packages/calendar.scm | 1 +
gnu/packages/cluster.scm | 2 +-
gnu/packages/databases.scm | 1 +
gnu/packages/dav.scm | 3 +-
gnu/packages/disk.scm | 1 +
gnu/packages/django.scm | 1 +
gnu/packages/elf.scm | 2 +-
gnu/packages/emacs-xyz.scm | 1 +
gnu/packages/emulators.scm | 2 +-
gnu/packages/finance.scm | 1 +
gnu/packages/image.scm | 3 +-
gnu/packages/libffi.scm | 1 +
gnu/packages/mail.scm | 3 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/openstack.scm | 1 +
gnu/packages/pdf.scm | 1 +
gnu/packages/python-web.scm | 1 +
gnu/packages/python-xyz.scm | 328 +----------------------
gnu/packages/search.scm | 1 +
gnu/packages/sphinx.scm | 449 ++++++++++++++++++++++++++++++++
gnu/packages/statistics.scm | 1 +
gnu/packages/storage.scm | 1 +
gnu/packages/sync.scm | 2 +-
gnu/packages/terminals.scm | 1 +
gnu/packages/tls.scm | 1 +
gnu/packages/web.scm | 7 +-
29 files changed, 484 insertions(+), 339 deletions(-)
create mode 100644 gnu/packages/sphinx.scm
--
2.21.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx).
2019-05-12 22:09 [bug#35705] [PATCH 0/9] Sphinx 2.0 Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx Marius Bakke
` (7 more replies)
2019-05-14 21:23 ` [bug#35705] [PATCH 0/9] Sphinx 2.0 Ricardo Wurmus
2019-05-25 10:56 ` bug#35705: " Marius Bakke
2 siblings, 8 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/python-xyz.scm (python-sphinxcontrib-websupport,
python2-sphinxcontrib-websupport, python-sphinx, python2-sphinx,
python-sphinx-gallery, python2-sphinx-gallery, python-sphinx-rtd-theme,
python2-sphinx-rtd-theme, python-guzzle-sphinx-theme,
python2-guzzle-sphinx-theme, python-sphinxcontrib-newsfeed,
python-sphinxcontrib-programoutput, python2-sphinxcontrib-programoutput,
python-sphinx-repoze-interface, python2-sphinx-repoze-interface,
python-sphinx-cloud-sptheme, python2-sphinx-cloud-sptheme,
python-sphinx-alabaster-theme, python2-sphinx-alabaster-theme,
python-sphinx-me, python-sphinxcontrib-svg2pdfconverter): Move to ...
(gnu):
* gnu/packages/sphinx.scm: ... here. New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/packages/admin.scm, gnu/packages/bioinformatics.scm,
gnu/packages/calendar.scm, gnu/packages/cluster.scm,
gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/disk.scm,
gnu/packages/django.scm, gnu/packages/elf.scm, gnu/packages/emacs-xyz.scm,
gnu/packages/emulators.scm, gnu/packages/finance.scm, gnu/packages/image.scm,
gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm,
gnu/packages/openstack.scm, gnu/packages/pdf.scm, gnu/packages/python-web.scm,
gnu/packages/search.scm, gnu/packages/statistics.scm,
gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm,
gnu/packages/tls.scm, gnu/packages/web.scm: Adjust module imports.
---
gnu/local.mk | 1 +
gnu/packages/admin.scm | 1 +
gnu/packages/bioinformatics.scm | 1 +
gnu/packages/calendar.scm | 1 +
gnu/packages/cluster.scm | 2 +-
gnu/packages/databases.scm | 1 +
gnu/packages/dav.scm | 3 +-
gnu/packages/disk.scm | 1 +
gnu/packages/django.scm | 1 +
gnu/packages/elf.scm | 2 +-
gnu/packages/emacs-xyz.scm | 1 +
gnu/packages/emulators.scm | 2 +-
gnu/packages/finance.scm | 1 +
gnu/packages/image.scm | 1 +
gnu/packages/libffi.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/mpd.scm | 2 +-
gnu/packages/openstack.scm | 1 +
gnu/packages/pdf.scm | 1 +
gnu/packages/python-web.scm | 1 +
gnu/packages/python-xyz.scm | 328 +---------------------------
gnu/packages/search.scm | 1 +
gnu/packages/sphinx.scm | 369 ++++++++++++++++++++++++++++++++
gnu/packages/statistics.scm | 1 +
gnu/packages/storage.scm | 1 +
gnu/packages/sync.scm | 2 +-
gnu/packages/terminals.scm | 1 +
gnu/packages/tls.scm | 1 +
gnu/packages/web.scm | 3 +-
29 files changed, 399 insertions(+), 334 deletions(-)
create mode 100644 gnu/packages/sphinx.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 133293aad3..0eada4a839 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -434,6 +434,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/smalltalk.scm \
%D%/packages/sml.scm \
%D%/packages/speech.scm \
+ %D%/packages/sphinx.scm \
%D%/packages/spice.scm \
%D%/packages/sqlite.scm \
%D%/packages/ssh.scm \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index b6aba4c38b..42dff02b08 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -89,6 +89,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages terminals)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages groff)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index ce720f46ed..0685ca966b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -109,6 +109,7 @@
#:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
#:use-module (gnu packages shells)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages statistics)
#:use-module (gnu packages swig)
#:use-module (gnu packages tbb)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 2969228ee9..af692e59f2 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -40,6 +40,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 8d6669cd22..3608d67bed 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -24,7 +24,7 @@
#:use-module (guix packages)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 403c3b1fb5..de9d3921ab 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -94,6 +94,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 0bb446bc3c..3b040028a1 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -26,7 +26,8 @@
#:use-module (gnu packages check)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
- #:use-module (gnu packages python-xyz))
+ #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx))
(define-public radicale
(package
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c8d2af88ca..c470b1faa6 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -57,6 +57,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages vim)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b9554a388e..e9593c85a2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -35,6 +35,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages time))
(define-public python-django
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 99f49eb7a7..09be3a75a3 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -34,7 +34,7 @@
#:use-module (gnu packages m4)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
- #:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages xml))
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 069bf3e1f6..dd49e2f828 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -123,6 +123,7 @@
#:use-module (gnu packages fontutils)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages shells)
#:use-module (gnu packages sqlite)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index a237b0ee1a..23e5a976ce 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -65,9 +65,9 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
- #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ff7fbe0403..d7536a3518 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -63,6 +63,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d46354b14e..528f1dcdcb 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -68,6 +68,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages qt)
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index f47f7623b4..c1d50ec314 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages sphinx)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system ruby))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2f56b7bcba..aeac81d072 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -106,6 +106,7 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages samba)
#:use-module (gnu packages screen)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index a6f6819d3e..f631dbd7c6 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -50,8 +50,8 @@
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
- #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pulseaudio)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages video)
#:use-module (gnu packages xiph))
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 2906a574cf..289b845ebc 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -28,6 +28,7 @@
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 75bdf87bf3..cb9d4f653c 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -74,6 +74,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages xdisorg)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2db94f0430..46a6e0d75e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -62,6 +62,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages tls)
#:use-module (gnu packages time)
#:use-module (gnu packages web)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5ed1ebdd3c..22f514daa6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -124,6 +124,7 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages search)
#:use-module (gnu packages shells)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
#:use-module (gnu packages terminals)
#:use-module (gnu packages tex)
@@ -2503,174 +2504,6 @@ reStructuredText.")
(define-public python2-pygments
(package-with-python2 python-pygments))
-(define-public python-sphinxcontrib-websupport
- (package
- (name "python-sphinxcontrib-websupport")
- (version "1.1.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "sphinxcontrib-websupport" version))
- (sha256
- (base32
- "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x"))))
- (build-system python-build-system)
- (arguments
- ;; FIXME: Tests depend on Sphinx, which depends on this.
- `(#:tests? #f))
- (home-page "http://sphinx-doc.org/")
- (synopsis "Sphinx API for web applications")
- (description "This package provides a Python API to easily integrate
-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
- (package
- (name "python-sphinx")
- (version "1.7.7")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "Sphinx" version))
- (sha256
- (base32
- "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda _
- ;; Requires Internet access.
- (delete-file "tests/test_build_linkcheck.py")
- (substitute* "tests/test_build_latex.py"
- (("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
- "@pytest.mark.skip()"))
- (when (which "python")
- ;; XXX: These tests are broken when using Python2:
- ;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
- (delete-file "tests/test_api_translator.py")
- (delete-file "tests/test_setup_command.py"))
- (invoke "make" "test"))))))
- (propagated-inputs
- `(("python-imagesize" ,python-imagesize)
- ("python-sphinx-alabaster-theme"
- ,python-sphinx-alabaster-theme)
- ("python-babel" ,python-babel)
- ("python-snowballstemmer" ,python-snowballstemmer)
- ("python-docutils" ,python-docutils)
- ("python-jinja2" ,python-jinja2)
- ("python-packaging" ,python-packaging)
- ("python-pygments" ,python-pygments)
- ("python-requests" ,python-requests)
- ("python-six" ,python-six)
- ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)))
- (native-inputs
- `(("graphviz" ,graphviz)
- ("imagemagick" ,imagemagick) ;for "convert"
- ("python-html5lib" ,python-html5lib)
- ("python-mock" ,python-mock)
- ("python-nose" ,python-nose)
- ("python-pytest" ,python-pytest)))
- (home-page "http://sphinx-doc.org/")
- (synopsis "Python documentation generator")
- (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))))))
-
-(define-public python-sphinx-gallery
- (package
- (name "python-sphinx-gallery")
- (version "0.1.13")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery"
- "/archive/v" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd"))))
- (build-system python-build-system)
- (arguments
- ;; FIXME: Tests attempt to download <https://docs.python.org/3/objects.inv>,
- ;; <https://docs.scipy.org/doc/numpy/objects.inv>, and
- ;; <https://matplotlib.org/objects.inv>.
- `(#:tests? #f))
- (native-inputs
- `(("python-pytest-runner" ,python-pytest-runner)))
- (home-page "https://sphinx-gallery.github.io/")
- (synopsis "Generate an examples gallery automatically")
- (description
- "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version
-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-rtd-theme
- (package
- (name "python-sphinx-rtd-theme")
- (version "0.2.4")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "sphinx_rtd_theme" version))
- (sha256
- (base32
- "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd"))))
- (build-system python-build-system)
- (arguments '(#:tests? #f)) ; No tests.
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)))
- (home-page "https://github.com/snide/sphinx_rtd_theme/")
- (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 python-guzzle-sphinx-theme
- (package
- (name "python-guzzle-sphinx-theme")
- (version "0.7.11")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "guzzle_sphinx_theme" version))
- (sha256
- (base32
- "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)))
- (home-page "https://github.com/guzzle/guzzle_sphinx_theme")
- (synopsis "Sphinx theme used by Guzzle")
- (description "This package provides guzzle_sphinx_theme, a theme for the
-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-bumpversion
(package
(name "python-bumpversion")
@@ -8041,26 +7874,6 @@ files for use with Python.")
(home-page "https://github.com/collective/icalendar")
(license license:bsd-2)))
-(define-public python-sphinxcontrib-newsfeed
- (package
- (name "python-sphinxcontrib-newsfeed")
- (version "0.1.4")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "sphinxcontrib-newsfeed" version))
- (sha256
- (base32
- "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"))))
- (arguments '(#:tests? #f)) ; No tests.
- (build-system python-build-system)
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)))
- (synopsis "News Feed extension for Sphinx")
- (description "Sphinxcontrib-newsfeed is an extension for adding a simple
-Blog, News or Announcements section to a Sphinx website.")
- (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed")
- (license license:bsd-2)))
-
(define-public python-args
(package
(name "python-args")
@@ -8860,56 +8673,6 @@ programmatically interfacing with your system's $EDITOR.")
(define-public python2-editor
(package-with-python2 python-editor))
-(define-public python-sphinxcontrib-programoutput
- (package
- (name "python-sphinxcontrib-programoutput")
- (version "0.10")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "sphinxcontrib-programoutput" version))
- (sha256
- (base32
- "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx"))))
- (build-system python-build-system)
- (arguments
- ;; FIXME: Many tests are failing and the upstream is gone.
- '(#:tests? #f))
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)))
- (synopsis "Sphinx extension to include program output")
- (description "A Sphinx extension to literally insert the output of arbitrary
-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-sphinx-repoze-autointerface
- (package
- (name "python-sphinx-repoze-autointerface")
- (version "0.8")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "repoze.sphinx.autointerface" version))
- (sha256
- (base32
- "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f"))))
- (build-system python-build-system)
- (arguments '(#:tests? #f)) ; No tests.
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)
- ("python-zope-interface" ,python-zope-interface)))
- (synopsis "Auto-generate Sphinx API docs from Zope interfaces")
- (description "This package defines an extension for the Sphinx documentation
-system. The extension allows generation of API documentation by
-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-vobject
(package
(name "python-vobject")
@@ -10895,52 +10658,6 @@ English stemmer.")
(define-public python2-snowballstemmer
(package-with-python2 python-snowballstemmer))
-(define-public python-sphinx-cloud-sptheme
- (package
- (name "python-sphinx-cloud-sptheme")
- (version "1.8.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "cloud_sptheme" version))
- (sha256
- (base32
- "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd"))))
- (build-system python-build-system)
- ;; FIXME: The 'pypi' release archive does not contain tests.
- (arguments '(#:tests? #f))
- (native-inputs
- `(("python-sphinx" ,python-sphinx)))
- (home-page "https://bitbucket.org/ecollins/cloud_sptheme")
- (synopsis "'Cloud' theme for Sphinx documenter")
- (description "This package contains the \"Cloud\" theme for Sphinx and some
-related extensions.")
- (license license:bsd-3)))
-
-(define-public python2-sphinx-cloud-sptheme
- (package-with-python2 python-sphinx-cloud-sptheme))
-
-(define-public python-sphinx-alabaster-theme
- (package
- (name "python-sphinx-alabaster-theme")
- (version "0.7.12")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "alabaster" version))
- (sha256
- (base32
- "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-pygments" ,python-pygments)))
- (home-page "https://alabaster.readthedocs.io/")
- (synopsis "Configurable sidebar-enabled Sphinx theme")
- (description "Alabaster is a visually (c)lean, responsive, configurable
-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-setproctitle
(package
(name "python-setproctitle")
@@ -12245,30 +11962,6 @@ make common patterns shorter and easier.")
(define-public python2-utils
(package-with-python2 python-utils))
-(define-public python-sphinx-me
- (package
- (name "python-sphinx-me")
- (version "0.3")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "sphinx-me" version))
- (sha256
- (base32
- "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq"))))
- (build-system python-build-system)
- (home-page "https://github.com/stephenmcd/sphinx-me")
- (synopsis "Create a Sphinx documentation shell")
- (description
- "Create a Sphinx documentation shell for your project and include the
-README file as the documentation index. It handles extracting the required
-meta data such as the project name, author and version from your project for
-use in your Sphinx docs.")
- (license license:bsd-2)))
-
-(define-public python2-sphinx-me
- (package-with-python2 python-sphinx-me))
-
(define-public python-diff-match-patch
(package
(name "python-diff-match-patch")
@@ -15646,22 +15339,3 @@ space that are close to a given query point. It also creates large read-only
file-based data structures that are @code{mmap}ped into memory so that many
processes may share the same data.")
(license license:asl2.0)))
-
-(define-public python-sphinxcontrib-svg2pdfconverter
- (package
- (name "python-sphinxcontrib-svg2pdfconverter")
- (version "0.1.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version))
- (sha256
- (base32
- "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-sphinx" ,python-sphinx)))
- (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases")
- (synopsis "Sphinx SVG to PDF converter extension")
- (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support
-SVG images natively (e.g. LaTeX).")
- (license license:bsd-3)))
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index fe51900179..9b2876c359 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages web)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml))
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
new file mode 100644
index 0000000000..088f0d3b38
--- /dev/null
+++ b/gnu/packages/sphinx.scm
@@ -0,0 +1,369 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 David Thompson <davet@gnu.org>
+;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
+;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages sphinx)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system python)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages graphviz)
+ #: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))
+
+(define-public python-sphinx
+ (package
+ (name "python-sphinx")
+ (version "1.7.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "Sphinx" version))
+ (sha256
+ (base32
+ "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ ;; Requires Internet access.
+ (delete-file "tests/test_build_linkcheck.py")
+ (substitute* "tests/test_build_latex.py"
+ (("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
+ "@pytest.mark.skip()"))
+ (when (which "python")
+ ;; XXX: These tests are broken when using Python2:
+ ;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
+ (delete-file "tests/test_api_translator.py")
+ (delete-file "tests/test_setup_command.py"))
+ (invoke "make" "test"))))))
+ (propagated-inputs
+ `(("python-imagesize" ,python-imagesize)
+ ("python-sphinx-alabaster-theme"
+ ,python-sphinx-alabaster-theme)
+ ("python-babel" ,python-babel)
+ ("python-snowballstemmer" ,python-snowballstemmer)
+ ("python-docutils" ,python-docutils)
+ ("python-jinja2" ,python-jinja2)
+ ("python-packaging" ,python-packaging)
+ ("python-pygments" ,python-pygments)
+ ("python-requests" ,python-requests)
+ ("python-six" ,python-six)
+ ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)))
+ (native-inputs
+ `(("graphviz" ,graphviz)
+ ("imagemagick" ,imagemagick) ;for "convert"
+ ("python-html5lib" ,python-html5lib)
+ ("python-mock" ,python-mock)
+ ("python-nose" ,python-nose)
+ ("python-pytest" ,python-pytest)))
+ (home-page "http://sphinx-doc.org/")
+ (synopsis "Python documentation generator")
+ (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))))))
+
+(define-public python-sphinxcontrib-newsfeed
+ (package
+ (name "python-sphinxcontrib-newsfeed")
+ (version "0.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-newsfeed" version))
+ (sha256
+ (base32
+ "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"))))
+ (arguments '(#:tests? #f)) ; No tests.
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (synopsis "News Feed extension for Sphinx")
+ (description "Sphinxcontrib-newsfeed is an extension for adding a simple
+Blog, News or Announcements section to a Sphinx website.")
+ (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed")
+ (license license:bsd-2)))
+
+(define-public python-sphinxcontrib-programoutput
+ (package
+ (name "python-sphinxcontrib-programoutput")
+ (version "0.10")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-programoutput" version))
+ (sha256
+ (base32
+ "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx"))))
+ (build-system python-build-system)
+ (arguments
+ ;; FIXME: Many tests are failing and the upstream is gone.
+ '(#:tests? #f))
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (synopsis "Sphinx extension to include program output")
+ (description "A Sphinx extension to literally insert the output of arbitrary
+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")
+ (version "0.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version))
+ (sha256
+ (base32
+ "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases")
+ (synopsis "Sphinx SVG to PDF converter extension")
+ (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support
+SVG images natively (e.g. LaTeX).")
+ (license license:bsd-3)))
+
+(define-public python-sphinxcontrib-websupport
+ (package
+ (name "python-sphinxcontrib-websupport")
+ (version "1.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-websupport" version))
+ (sha256
+ (base32
+ "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x"))))
+ (build-system python-build-system)
+ (arguments
+ ;; FIXME: Tests depend on Sphinx, which depends on this.
+ `(#:tests? #f))
+ (home-page "http://sphinx-doc.org/")
+ (synopsis "Sphinx API for web applications")
+ (description "This package provides a Python API to easily integrate
+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")
+ (version "0.1.13")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery"
+ "/archive/v" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd"))))
+ (build-system python-build-system)
+ (arguments
+ ;; FIXME: Tests attempt to download <https://docs.python.org/3/objects.inv>,
+ ;; <https://docs.scipy.org/doc/numpy/objects.inv>, and
+ ;; <https://matplotlib.org/objects.inv>.
+ `(#:tests? #f))
+ (native-inputs
+ `(("python-pytest-runner" ,python-pytest-runner)))
+ (home-page "https://sphinx-gallery.github.io/")
+ (synopsis "Generate an examples gallery automatically")
+ (description
+ "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version
+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")
+ (version "0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinx-me" version))
+ (sha256
+ (base32
+ "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/stephenmcd/sphinx-me")
+ (synopsis "Create a Sphinx documentation shell")
+ (description
+ "Create a Sphinx documentation shell for your project and include the
+README file as the documentation index. It handles extracting the required
+meta data such as the project name, author and version from your project for
+use in your Sphinx docs.")
+ (license license:bsd-2)))
+
+(define-public python-sphinx-repoze-autointerface
+ (package
+ (name "python-sphinx-repoze-autointerface")
+ (version "0.8")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "repoze.sphinx.autointerface" version))
+ (sha256
+ (base32
+ "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f"))))
+ (build-system python-build-system)
+ (arguments '(#:tests? #f)) ; No tests.
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)
+ ("python-zope-interface" ,python-zope-interface)))
+ (synopsis "Auto-generate Sphinx API docs from Zope interfaces")
+ (description "This package defines an extension for the Sphinx documentation
+system. The extension allows generation of API documentation by
+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")
+ (version "0.7.12")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "alabaster" version))
+ (sha256
+ (base32
+ "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-pygments" ,python-pygments)))
+ (home-page "https://alabaster.readthedocs.io/")
+ (synopsis "Configurable sidebar-enabled Sphinx theme")
+ (description "Alabaster is a visually (c)lean, responsive, configurable
+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")
+ (version "1.8.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "cloud_sptheme" version))
+ (sha256
+ (base32
+ "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd"))))
+ (build-system python-build-system)
+ ;; FIXME: The 'pypi' release archive does not contain tests.
+ (arguments '(#:tests? #f))
+ (native-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (home-page "https://bitbucket.org/ecollins/cloud_sptheme")
+ (synopsis "'Cloud' theme for Sphinx documenter")
+ (description "This package contains the \"Cloud\" theme for Sphinx and some
+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")
+ (version "0.7.11")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "guzzle_sphinx_theme" version))
+ (sha256
+ (base32
+ "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (home-page "https://github.com/guzzle/guzzle_sphinx_theme")
+ (synopsis "Sphinx theme used by Guzzle")
+ (description "This package provides guzzle_sphinx_theme, a theme for the
+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")
+ (version "0.2.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinx_rtd_theme" version))
+ (sha256
+ (base32
+ "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd"))))
+ (build-system python-build-system)
+ (arguments '(#:tests? #f)) ; No tests.
+ (propagated-inputs
+ `(("python-sphinx" ,python-sphinx)))
+ (home-page "https://github.com/snide/sphinx_rtd_theme/")
+ (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/statistics.scm b/gnu/packages/statistics.scm
index 8bcc90f126..699f1d63a3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -66,6 +66,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tcl)
#:use-module (gnu packages tex)
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 9e7cd10918..503433be10 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -47,6 +47,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 136ffec9e7..51ed0317bc 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -37,11 +37,11 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages perl)
- #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
#:use-module (gnu packages rsync)
#:use-module (gnu packages selinux)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls))
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index a3ea05538b..512e98ec7b 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -68,6 +68,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages ssh)
#:use-module (gnu packages textutils)
#:use-module (gnu packages xdisorg)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 11bb64ce8b..f7ac867e5d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -59,6 +59,7 @@
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages base)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 52cc91a168..fd38a6bf00 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -74,6 +74,7 @@
#:use-module (gnu packages docbook)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases)
#:use-module (gnu packages bison)
@@ -118,7 +119,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages xml)
- #:use-module (gnu packages curl)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml Marius Bakke
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp Marius Bakke
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-serializinghtml): New public
variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 82a0df2499..1810716e6b 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -137,6 +137,26 @@ 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 python-sphinxcontrib-serializinghtml
+ (package
+ (name "python-sphinxcontrib-serializinghtml")
+ (version "1.1.3")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-serializinghtml" version))
+ (sha256
+ (base32
+ "09sj3nwahwr4iymg86gczbh151cfczqhf2kclbblzh2jh0zv7vy0"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml")
+ (synopsis "Sphinx extension to serialize HTML files")
+ (description
+ "@code{sphinxcontrib-serializinghtml} is a Sphinx extension which outputs
+\"serialized\" HTML files.")
+ (license license:bsd-2)))
+
(define-public python-sphinxcontrib-svg2pdfconverter
(package
(name "python-sphinxcontrib-svg2pdfconverter")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp Marius Bakke
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-applehelp): New public variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 1810716e6b..4e5b791a6f 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -95,6 +95,26 @@ for Python projects or other documents consisting of multiple reStructuredText
sources.")
(license license:bsd-3)))
+(define-public python-sphinxcontrib-applehelp
+ (package
+ (name "python-sphinxcontrib-applehelp")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-applehelp" version))
+ (sha256
+ (base32
+ "15rqmgphj4wqf4m5wnzxgmwxx5jwfzb0j0nb94ql0x5wnar0mapd"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-applehelp")
+ (synopsis "Sphinx extension for creating Apple help books")
+ (description
+ "@code{sphinxcontrib-applehelp} is a Sphinx extension which outputs
+Apple help books.")
+ (license license:bsd-2)))
+
(define-public python-sphinxcontrib-newsfeed
(package
(name "python-sphinxcontrib-newsfeed")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (2 preceding siblings ...)
2019-05-12 22:12 ` [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath Marius Bakke
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-devhelp): New public variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 4e5b791a6f..b184dc4e8c 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -115,6 +115,26 @@ sources.")
Apple help books.")
(license license:bsd-2)))
+(define-public python-sphinxcontrib-devhelp
+ (package
+ (name "python-sphinxcontrib-devhelp")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-devhelp" version))
+ (sha256
+ (base32
+ "0d2a57kqxl72i55rns0ly1i044y2x234b9sdi89ajc3kjdvv0r3c"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-devhelp")
+ (synopsis "Sphinx extension for creating Devhelp documents")
+ (description
+ "@code{sphinxcontrib-devhelp} is a Sphinx extension which outputs
+@url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.")
+ (license license:bsd-2)))
+
(define-public python-sphinxcontrib-newsfeed
(package
(name "python-sphinxcontrib-newsfeed")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (3 preceding siblings ...)
2019-05-12 22:12 ` [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp Marius Bakke
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-jsmath): New public variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b184dc4e8c..b782504d46 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -135,6 +135,26 @@ Apple help books.")
@url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.")
(license license:bsd-2)))
+(define-public python-sphinxcontrib-jsmath
+ (package
+ (name "python-sphinxcontrib-jsmath")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-jsmath" version))
+ (sha256
+ (base32
+ "1f64w19j33sp151jimibraw6qrbhd5gxy8hs3797w9478m55x4m9"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-jsmath")
+ (synopsis "Sphinx extension to render math equations")
+ (description
+ "@code{sphinxcontrib-jsmath} is a Sphinx extension which renders display
+math in HTML via JavaScript.")
+ (license license:bsd-3)))
+
(define-public python-sphinxcontrib-newsfeed
(package
(name "python-sphinxcontrib-newsfeed")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (4 preceding siblings ...)
2019-05-12 22:12 ` [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1 Marius Bakke
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-htmlhelp): New public variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b782504d46..4bf737b8f2 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -135,6 +135,26 @@ Apple help books.")
@url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.")
(license license:bsd-2)))
+(define-public python-sphinxcontrib-htmlhelp
+ (package
+ (name "python-sphinxcontrib-htmlhelp")
+ (version "1.0.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-htmlhelp" version))
+ (sha256
+ (base32
+ "08l4x8a2l4xjqdd5rhvmfsqihmlgg4prdayj9b6pigaii6gzjw26"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp")
+ (synopsis "Sphinx exension for rendering HTML help files")
+ (description
+ "@code{sphinxcontrib-htmlhelp} is a Sphinx extension which renders
+HTML help files.")
+ (license license:bsd-2)))
+
(define-public python-sphinxcontrib-jsmath
(package
(name "python-sphinxcontrib-jsmath")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (5 preceding siblings ...)
2019-05-12 22:12 ` [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1 Marius Bakke
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinxcontrib-qthelp): New public variable.
---
gnu/packages/sphinx.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 4bf737b8f2..68cd158a3b 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -217,6 +217,26 @@ 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 python-sphinxcontrib-qthelp
+ (package
+ (name "python-sphinxcontrib-qthelp")
+ (version "1.0.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinxcontrib-qthelp" version))
+ (sha256
+ (base32
+ "0vs09m6kf5vhiivpi5s5pks59iq0lqlsbkdycpqlysg53bhmqikr"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ;XXX: circular dependency on Sphinx
+ (home-page "https://github.com/sphinx-doc/sphinxcontrib-qthelp")
+ (synopsis "Sphinx extension to output QtHelp documents")
+ (description
+ "@code{sphinxcontrib-qthelp} is a Sphinx extension which outputs QtHelp
+documents.")
+ (license license:bsd-2)))
+
(define-public python-sphinxcontrib-serializinghtml
(package
(name "python-sphinxcontrib-serializinghtml")
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1.
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
` (6 preceding siblings ...)
2019-05-12 22:12 ` [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp Marius Bakke
@ 2019-05-12 22:12 ` Marius Bakke
7 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-12 22:12 UTC (permalink / raw)
To: 35705
* gnu/packages/sphinx.scm (python-sphinx): Update to 2.0.1.
[arguments]: Remove Python2 workaround.
[propagated-inputs]: Remove PYTHON-SIX and PYTHON-SPHINXCONTRIB-WEBSUPPORT.
Add PYTHON-SPHINXCONTRIB-APPLEHELP, PYTHON-SPHINXCONTRIB-DEVHELP,
PYTHON-SPHINXCONTRIB-HTMLHELP, PYTHON-SPHINXCONTRIB-JSMATH,
PYTHON-SPHINXCONTRIB-QTHELP, and PYTHON-SPHINXCONTRIB-SERIALIZINGHTML.
---
gnu/packages/sphinx.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 68cd158a3b..eae7eee654 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -43,14 +43,14 @@
(define-public python-sphinx
(package
(name "python-sphinx")
- (version "1.7.7")
+ (version "2.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
- "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
+ "0js0rnbzm0nsb4gm2v4z79wlbmr05awqzic57kfl8ydkdxj80cj2"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -62,11 +62,6 @@
(substitute* "tests/test_build_latex.py"
(("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
"@pytest.mark.skip()"))
- (when (which "python")
- ;; XXX: These tests are broken when using Python2:
- ;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
- (delete-file "tests/test_api_translator.py")
- (delete-file "tests/test_setup_command.py"))
(invoke "make" "test"))))))
(propagated-inputs
`(("python-imagesize" ,python-imagesize)
@@ -79,8 +74,13 @@
("python-packaging" ,python-packaging)
("python-pygments" ,python-pygments)
("python-requests" ,python-requests)
- ("python-six" ,python-six)
- ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)))
+ ("python-sphinxcontrib-applehelp" ,python-sphinxcontrib-applehelp)
+ ("python-sphinxcontrib-devhelp" ,python-sphinxcontrib-devhelp)
+ ("python-sphinxcontrib-htmlhelp" ,python-sphinxcontrib-htmlhelp)
+ ("python-sphinxcontrib-jsmath" ,python-sphinxcontrib-jsmath)
+ ("python-sphinxcontrib-qthelp" ,python-sphinxcontrib-qthelp)
+ ("python-sphinxcontrib-serializinghtml"
+ ,python-sphinxcontrib-serializinghtml)))
(native-inputs
`(("graphviz" ,graphviz)
("imagemagick" ,imagemagick) ;for "convert"
--
2.21.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#35705] [PATCH 0/9] Sphinx 2.0
2019-05-12 22:09 [bug#35705] [PATCH 0/9] Sphinx 2.0 Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
@ 2019-05-14 21:23 ` Ricardo Wurmus
2019-05-25 10:56 ` bug#35705: " Marius Bakke
2 siblings, 0 replies; 12+ messages in thread
From: Ricardo Wurmus @ 2019-05-14 21:23 UTC (permalink / raw)
To: Marius Bakke; +Cc: 35705
Marius Bakke <mbakke@fastmail.com> writes:
> These patches migrate Sphinx to its own module and updates to 2.0.
>
> Sphinx 2 no longer supports Python 2, so it is removed first.
Thanks for working on it. As discussed on IRC we have some packages
(such as python2-pbcore) which need python2-sphinx, so it would be good
to keep a Python 2 version around for now.
--
Ricardo
^ permalink raw reply [flat|nested] 12+ messages in thread
* bug#35705: [PATCH 0/9] Sphinx 2.0
2019-05-12 22:09 [bug#35705] [PATCH 0/9] Sphinx 2.0 Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
2019-05-14 21:23 ` [bug#35705] [PATCH 0/9] Sphinx 2.0 Ricardo Wurmus
@ 2019-05-25 10:56 ` Marius Bakke
2 siblings, 0 replies; 12+ messages in thread
From: Marius Bakke @ 2019-05-25 10:56 UTC (permalink / raw)
To: 35705-done
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> These patches migrate Sphinx to its own module and updates to 2.0.
>
> Sphinx 2 no longer supports Python 2, so it is removed first.
>
> Note: The last patch is intended for the 'staging' branch.
>
> Marius Bakke (9):
> gnu: Move Sphinx and friends to (gnu packages sphinx).
> gnu: Remove python2-sphinx.
> gnu: Add python-sphinxcontrib-serializinghtml.
> gnu: Add python-sphinxcontrib-applehelp.
> gnu: Add python-sphinxcontrib-devhelp.
> gnu: Add python-sphinxcontrib-jsmath.
> gnu: Add python-sphinxcontrib-htmlhelp.
> gnu: Add python-sphinxcontrib-qthelp.
> gnu: python-sphinx: Update to 2.0.1.
Pushed, without removing python2-sphinx.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-05-25 10:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-12 22:09 [bug#35705] [PATCH 0/9] Sphinx 2.0 Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1 Marius Bakke
2019-05-14 21:23 ` [bug#35705] [PATCH 0/9] Sphinx 2.0 Ricardo Wurmus
2019-05-25 10:56 ` bug#35705: " Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.