htgoebel pushed a commit to branch wip-python-build-system
in repository guix.

commit bb9042b0faeb18bdcd01db261b57597dd6cf8b24
Author: Hartmut Goebel <h.goe...@crazy-compilers.com>
Date:   Wed Sep 28 10:36:45 2016 +0200

    gnu: ensure pip and setuptools are installed even for Python 2.
    
    * gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to
      configure-flags.
    * doc/guix.texi (Python Modules): Document it.
---
 doc/guix.texi           |    9 ++++++---
 gnu/packages/python.scm |    1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 74733f4..46c059a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12344,7 +12344,6 @@ for instance, the module python-dateutil is packaged 
under the names
 starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as
 described above.
 
-
 @subsubsection Specifying Dependencies
 @cindex inputs, for Python packages
 
@@ -12361,6 +12360,11 @@ following check list to determine which dependency 
goes where.
 @itemize
 
 @item
+We currently package Python 2 with @code{setuptools} and @code{pip}
+installed like Python 3.4 has per default.  Thus you don't need to
+specify either of these as an input.
+
+@item
 Python dependencies required at run time go into
 @code{propagated-inputs}.  They are typically defined with the
 @code{install_requires} keyword in @file{setup.py}, or in the
@@ -12374,8 +12378,7 @@ testing---e.g., those in @code{tests_require}---go into
 propagated because they are not needed at run time, and (2) in a
 cross-compilation context, it's the ``native'' input that we'd want.
 
-Examples are @code{setuptools}, which is usually needed only at build
-time, or the @code{pytest}, @code{mock}, and @code{nose} test
+Examples are the @code{pytest}, @code{mock}, and @code{nose} test
 frameworks.  Of course if any of these packages is also required at
 run-time, it needs to go to @code{propagated-inputs}.
 
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9fd8eb..70147cd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -156,6 +156,7 @@
        #:configure-flags
        (list "--enable-shared"                    ;allow embedding
              "--with-system-ffi"                  ;build ctypes
+             "--with-ensurepip=install"           ;install pip and setuptools
              (string-append "LDFLAGS=-Wl,-rpath="
                             (assoc-ref %outputs "out") "/lib"))
 

Reply via email to