[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/57: gnu: ensure pip and setuptools are installed even for Python 2.
From: |
Hartmut Goebel |
Subject: |
01/57: gnu: ensure pip and setuptools are installed even for Python 2. |
Date: |
Sat, 15 Oct 2016 14:08:09 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 774b28e752e6e396be40021ebd5f00418c6b3e3b
Author: Hartmut Goebel <address@hidden>
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.
+
address@hidden
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 6207896..6dee41d 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"))
- branch wip-python-build-system created (now f73de82), Hartmut Goebel, 2016/10/15
- 01/57: gnu: ensure pip and setuptools are installed even for Python 2.,
Hartmut Goebel <=
- 02/57: guix: build all Python packages with --single-version-externally-managed., Hartmut Goebel, 2016/10/15
- 03/57: guix: python-build-system: Import setuptools before calling `setup.py'., Hartmut Goebel, 2016/10/15
- 15/57: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/15
- 05/57: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/15
- 04/57: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/15
- 12/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3), Hartmut Goebel, 2016/10/15
- 18/57: gnu: python-pytest: Propagate input "python-py"., Hartmut Goebel, 2016/10/15
- 17/57: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/15
- 07/57: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/15
- 08/57: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/15