[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/103: guix: python-build-system: Delete .egg-info file created in phas
From: |
Hartmut Goebel |
Subject: |
07/103: guix: python-build-system: Delete .egg-info file created in phase check. |
Date: |
Tue, 25 Oct 2016 17:44:37 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit d9c2e587aeaf2410d50823b4367ec1e4ab2c777d
Author: Hartmut Goebel <address@hidden>
Date: Fri Oct 7 17:17:00 2016 +0200
guix: python-build-system: Delete .egg-info file created in phase check.
* guix/build/python-build-system.scm (check): Delete .egg-info dirs
which did not exist prior to calling setup.py but afterwards.
---
guix/build/python-build-system.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index a4e8038..19fd333 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -67,7 +67,15 @@
(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
- (call-setuppy test-target '() use-setuptools?)
+ ;; Running `setup.py test` creates an additional .egg-info directory in
+ ;; build/lib in some cases, e.g. if the source is in a sub-directory
+ ;; (given with `package_dir`). This will by copied to the output, too,
+ ;; so we need to remove.
+ (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
+ (call-setuppy test-target '() use-setuptools?)
+ (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
+ (inter (lset-difference eqv? after before)))
+ (for-each delete-file-recursively inter)))
#t))
(define (get-python-version python)
- branch wip-python-build-system created (now 2e28c39), Hartmut Goebel, 2016/10/25
- 01/103: guix: python-build-system: Fix an outdated comment., Hartmut Goebel, 2016/10/25
- 02/103: gnu: ensure pip and setuptools are installed even for Python 2., Hartmut Goebel, 2016/10/25
- 04/103: guix: python-build-system: Import setuptools before calling `setup.py'., Hartmut Goebel, 2016/10/25
- 06/103: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/25
- 03/103: guix: build all Python packages with --single-version-externally-managed., Hartmut Goebel, 2016/10/25
- 07/103: guix: python-build-system: Delete .egg-info file created in phase check.,
Hartmut Goebel <=
- 05/103: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/25
- 10/103: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/25
- 08/103: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes., Hartmut Goebel, 2016/10/25
- 21/103: gnu: Fix python inputs, part 3: all native-inputs become propagated-inputs., Hartmut Goebel, 2016/10/25
- 17/103: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/25
- 22/103: gnu: Fix python inputs, part 4: special cases., Hartmut Goebel, 2016/10/25
- 09/103: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/25
- 26/103: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/25
- 27/103: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/25
- 20/103: gnu: Fix python inputs, part 2: all inputs become native-inputs., Hartmut Goebel, 2016/10/25