[bug#27740] [PATCH 1/3] gnu: Add python-xapian-bindings.

[bug#27740] [PATCH 1/3] gnu: Add python-xapian-bindings.

[Ricardo Wurmus]

* gnu/packages/search.scm (python-xapian-bindings): New variable.
---
 gnu/packages/search.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 8651b985e..cc8c0630b 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,6 +31,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml))
 
@@ -70,6 +72,32 @@ rich set of boolean query operators.")
     (home-page "https://xapian.org/")
     (license (list gpl2+ bsd-3 x11))))
 
+(define-public python-xapian-bindings
+  (package (inherit xapian)
+    (name "python-xapian-bindings")
+    (version (package-version xapian))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://oligarchy.co.uk/xapian/" version
+                                  "/xapian-bindings-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0fca9nsf7pj3fq991xcm5iainz3s8yqik4ycvavm09y486n3wciv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-python3")
+       #:make-flags
+       (list (string-append "pkgpylibdir="
+                            (assoc-ref %outputs "out")
+                            "/lib/python3.5/site-packages/xapian"))))
+    (inputs
+     `(("python" ,python)
+       ("python-sphinx" ,python-sphinx) ; for documentation
+       ("xapian" ,xapian)
+       ("zlib" ,zlib)))
+    (synopsis "Python bindings for the Xapian search engine library")
+    (license gpl2+)))
+
 (define-public libtocc
   (package
     (name "libtocc")
-- 
2.13.3

[bug#27741] [PATCH 2/3] gnu: Add python-sphinxcontrib-websupport.

[Ricardo Wurmus]

* gnu/packages/python.scm (python-sphinxcontrib-websupport): New variable.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index be1aec264..2cc282ac3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -100,6 +100,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
+  #:use-module (gnu packages search)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages statistics)
@@ -3161,6 +3162,35 @@ reStructuredText.")
 (define-public python2-pygments
   (package-with-python2 python-pygments))
 
+(define-public python-sphinxcontrib-websupport
+  (package
+    (name "python-sphinxcontrib-websupport")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "sphinxcontrib-websupport" version))
+              (sha256
+               (base32
+                "1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)
+       ("python-xapian-bindings" ,python-xapian-bindings)))
+    ;; Needed for running the test suite
+    (inputs
+     `(("python-six" ,python-six)
+       ("python-jinja2" ,python-jinja2)
+       ("python-docutils" ,python-docutils)
+       ("python-sphinx" ,python-sphinx)
+       ("python-sqlalchemy" ,python-sqlalchemy)
+       ("python-whoosh" ,python-whoosh)))
+    (home-page "http://sphinx-doc.org/")
+    (synopsis "Sphinx API for Web Apps")
+    (description "This package provides a Python API to easily integrate
+Sphinx documentation into your Web application.")
+    (license license:bsd-3)))
+
 (define-public python-sphinx
   (package
     (name "python-sphinx")
-- 
2.13.3

[bug#27741] [PATCH 2/3] gnu: Add python-sphinxcontrib-websupport.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/python.scm (python-sphinxcontrib-websupport): New variable.

[...]

> +    (propagated-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-pytest" ,python-pytest)
> +       ("python-xapian-bindings" ,python-xapian-bindings)))
> +    ;; Needed for running the test suite
> +    (inputs
> +     `(("python-six" ,python-six)

‘native-inputs’ then?

> +    (home-page "http://sphinx-doc.org/")
> +    (synopsis "Sphinx API for Web Apps")
> +    (description "This package provides a Python API to easily integrate
> +Sphinx documentation into your Web application.")

Perhaps you could expound a little bit.  :-)

Otherwise LGTM, thanks!

Ludo’.

bug#27741: [PATCH 2/3] gnu: Add python-sphinxcontrib-websupport.

[Ricardo Wurmus]

Ricardo Wurmus <rekado@elephly.net> writes:

> * gnu/packages/python.scm (python-sphinxcontrib-websupport): New variable.

Pushed with slight changes.  Should have been closed along with 27740
and 27742.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27742] [PATCH 3/3] gnu: Add python-sphinx-1.6.

[Ricardo Wurmus]

* gnu/packages/python.scm (python-sphinx-1.6): New variable.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2cc282ac3..2e5eec2a9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3235,6 +3235,36 @@ sources.")
     (license license:bsd-3)
     (properties `((python2-variant . ,(delay python2-sphinx))))))
 
+(define-public python-sphinx-1.6
+  (package (inherit python-sphinx)
+    (name "python-sphinx")
+    (version "1.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Sphinx" version))
+              (sha256
+               (base32
+                "1rj6f3i8hmrx2qlkshi5kp5xcy98dlynwlyl05yvflj5f66dp2xg"))))
+    (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()"))
+             (zero? (system* "make" "test")))))))
+    (propagated-inputs
+     `(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)
+       ,@(package-propagated-inputs python-sphinx)))
+    (native-inputs
+     `(("python-pytest" ,python-pytest-3.0)
+       ("imagemagick" ,imagemagick) ; for "convert"
+       ,@(package-native-inputs python-sphinx)))
+    (properties '())))
+
 (define-public python-sphinx-1.5.3
   (package
     (inherit python-sphinx)
-- 
2.13.3

[bug#27742] [PATCH 3/3] gnu: Add python-sphinx-1.6.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/python.scm (python-sphinx-1.6): New variable.

LGTM, thanks!

bug#27742: [PATCH 3/3] gnu: Add python-sphinx-1.6.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> * gnu/packages/python.scm (python-sphinx-1.6): New variable.
>
> LGTM, thanks!

Thanks, I’ve pushed the patches with changes to
python-sphinxcontrib-websupport.

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27740] [PATCH 1/3] gnu: Add python-xapian-bindings.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/search.scm (python-xapian-bindings): New variable.

LGTM, thanks!

bug#27740: [PATCH 1/3] gnu: Add python-xapian-bindings.

[Ricardo Wurmus]

> * gnu/packages/search.scm (python-xapian-bindings): New variable.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net