[PATCH 0/5] Fixes for packages with new python build sytem

[PATCH 0/5] Fixes for packages with new python build sytem

[Hartmut Goebel]

This patches fixes some build issues caused by using the new python build
system.

Hartmut Goebel (5):
  gnu: calibre: Do not use python setuptools for building.
  gnu: python-numpydoc: Correct inputs.
  gnu: python2-ipython: Fix inputs.
  gnu: python-numpy: Fix inputs.
  gnu: dblatex: Update comment.

 gnu/packages/docbook.scm | 10 +++++++---
 gnu/packages/ebook.scm   |  3 +++
 gnu/packages/python.scm  |  9 +++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

-- 
2.7.4

[PATCH 1/5] gnu: calibre: Do not use python setuptools for building.

[Hartmut Goebel]

* gnu/packages/ebook.scm (calibre)[arguments]: Set #:use-setuptools?
to false.
---
 gnu/packages/ebook.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index ad18716..3843fb2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -126,6 +126,9 @@
      `(#:python ,python-2
        #:test-target "check"
        #:tests? #f ; FIXME: enable once flake8 is packaged
+       ;; Calibre is using setuptools by itself, but the setup.py is not
+       ;; compatible with the shim wrapper (taken from pip) we are using.
+       #:use-setuptools? #f
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'configure
-- 
2.7.4

[PATCH 2/5] gnu: python-numpydoc: Correct inputs.

[Hartmut Goebel]

This does what 213d1745c6adbfd274b1edc575529e026b0ab743 was
supposed to do.

* gnu/packages/python.scm (python-numpydoc, python-numpydoc)
Change first of the duplicate [native-inputs] definitions to
[propagated-inputs].
---
 gnu/packages/python.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ea94f44..24df71f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3390,7 +3390,7 @@ that client code uses to construct the grammar directly in Python code.")
            (substitute* "numpydoc/tests/test_plot_directive.py"
              (("3") "2"))))))
     (build-system python-build-system)
-    (native-inputs
+    (propagated-inputs
      `(("python-sphinx" ,python-sphinx)))
     (native-inputs
      `(("python-nose" ,python-nose)))
-- 
2.7.4

[PATCH 3/5] gnu: python2-ipython: Fix inputs.

[Hartmut Goebel]

This fixes e62600feb6a3aca2304925ed8c0bb5a9060e38dd, where the inputs
have been changed to native-inputs, but still extended from inputs.

* gnu/packages/python.scm (python2-ipython)[native-inputs]: Extend
from python-ipython's package-native-inputs.
---
 gnu/packages/python.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 24df71f..c2dac25 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4814,7 +4814,7 @@ computing.")
       ;; FIXME: add pyreadline once available.
       (native-inputs
        `(("python2-mock" ,python2-mock)
-         ,@(package-inputs ipython))))))
+         ,@(package-native-inputs ipython))))))
 
 (define-public python-isodate
   (package
-- 
2.7.4

[PATCH 4/5] gnu: python-numpy: Fix inputs.

[Hartmut Goebel]

This fixes 2efabc5589dc641dce75702b99253a3fb40bb2eb, where some inputs
have been changed to propagated-inputs, but the propagated-inputs are
still extended from inputs and the inputs are not extended at all.

* gnu/packages/python.scm (python-numpy, python2-numpy)[inputs]:
Extend from python-numpy-bootstrap's package-inputs. [propagated-inputs]:
Extend from python-numpy-bootstrap's package-propagated-inputs.
---
 gnu/packages/python.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c2dac25..e373869 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3261,11 +3261,12 @@ association studies (GWAS) on extremely large data sets.")
     (name "python-numpy")
     (outputs '("out" "doc"))
     (inputs
-     `(("which" ,which)))
+     `(("which" ,which)
+       ,@(package-inputs python-numpy-bootstrap)))
     (propagated-inputs
      `(("python-matplotlib" ,python-matplotlib)
        ("python-pyparsing" ,python-pyparsing)
-       ,@(package-inputs python-numpy-bootstrap)))
+       ,@(package-propagated-inputs python-numpy-bootstrap)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python-sphinx" ,python-sphinx)
-- 
2.7.4

[PATCH 5/5] gnu: dblatex: Update comment.

[Hartmut Goebel]

* gnu/packages/docbook.scm (dblatex)[arguments]: Detail comment about why
the use of setuptools needs to be disabled.
---
 gnu/packages/docbook.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index f54e031..46041c2 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -192,9 +192,13 @@ by no means limited to these applications.)  This package provides XML DTDs.")
        ("libxslt" ,libxslt)))           ;for xsltproc
     (arguments
      `(#:python ,python-2               ;'print' syntax
-       ;; XXX: Disable usage of setuptools, even though it is supported.
-       ;; This causes an invalid "package_base" in out/bin/.dblatex-real
-       ;; due to a missing leading '/'. See this thread for details:
+       ;; Using setuptools causes an invalid "package_base" path in
+       ;; out/bin/.dblatex-real due to a missing leading '/'.  This is caused
+       ;; by dblatex's setup.py stripping the root path when creating the
+       ;; script.  (dblatex's setup.py still uses distutils and thus has to
+       ;; create the script by itself. The feature for creating scripts is one
+       ;; of setuptools' features.)
+       ;; See this thread for details:
        ;; https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00030.html
        #:use-setuptools? #f
        #:tests? #f                      ;no 'test' command
-- 
2.7.4

Re: [PATCH 0/5] Fixes for packages with new python build sytem

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> This patches fixes some build issues caused by using the new python build
> system.
>
> Hartmut Goebel (5):
>   gnu: calibre: Do not use python setuptools for building.
>   gnu: python-numpydoc: Correct inputs.
>   gnu: python2-ipython: Fix inputs.
>   gnu: python-numpy: Fix inputs.
>   gnu: dblatex: Update comment.
>
>  gnu/packages/docbook.scm | 10 +++++++---
>  gnu/packages/ebook.scm   |  3 +++
>  gnu/packages/python.scm  |  9 +++++----
>  3 files changed, 15 insertions(+), 7 deletions(-)

Thanks! These LGTM.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 0/5] Fixes for packages with new python build sytem

[Hartmut Goebel]

Am 02.12.2016 um 16:45 schrieb Marius Bakke:
>
> Thanks! These LGTM.

Pushed as 447b947. Thansk for the quick review.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |