[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/57: guix: python-build-system: Delete .egg-info file created in phase
From: |
Hartmut Goebel |
Subject: |
06/57: guix: python-build-system: Delete .egg-info file created in phase check. |
Date: |
Sat, 15 Oct 2016 14:08:10 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 3ec3a5746138b123e650bb5c10a91d975cd8dd2a
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 c4e5a75..c97a0ee 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)
- 18/57: gnu: python-pytest: Propagate input "python-py"., (continued)
- 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
- 19/57: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/15
- 23/57: inputs -> propagated-inputs: special, Hartmut Goebel, 2016/10/15
- 29/57: gnu: python-ccm: Update synopsis and description., Hartmut Goebel, 2016/10/15
- 22/57: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., Hartmut Goebel, 2016/10/15
- 32/57: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/15
- 38/57: gnu: python-pytest-flakes: Fix build., Hartmut Goebel, 2016/10/15
- 06/57: guix: python-build-system: Delete .egg-info file created in phase check.,
Hartmut Goebel <=
- 34/57: gnu: python-testrepositoryfixture: Correct inputs., Hartmut Goebel, 2016/10/15
- 33/57: gnu: python-fixture: Enable tests., Hartmut Goebel, 2016/10/15
- 42/57: gnu: python-fonttools: Remove intervening directory in site-packges., Hartmut Goebel, 2016/10/15
- 43/57: gnu: python-numpy-bootstrap, python-numpy: Fix build., Hartmut Goebel, 2016/10/15
- 44/57: gnu: python-matplotlib: Fix build., Hartmut Goebel, 2016/10/15
- 20/57: gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs., Hartmut Goebel, 2016/10/15
- 30/57: gnu: python-h5py: Remove needless "python2-variant" property., Hartmut Goebel, 2016/10/15
- 24/57: gnu: python-sphinx-rtd-theme: Remove inputs., Hartmut Goebel, 2016/10/15
- 31/57: gnu: python-hdf5: Correct inputs., Hartmut Goebel, 2016/10/15
- 28/57: gnu: python-ccm: Add missing input python-psutil., Hartmut Goebel, 2016/10/15