diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
| commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
| tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /gnu/packages/python-check.scm | |
| parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
| parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
| download | guix-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/python-check.scm')
| -rw-r--r-- | gnu/packages/python-check.scm | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 676dae5430..b8aaef9b77 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,11 +227,27 @@ testing framework.") (base32 "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; one test fails; can't find virtualenv + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Reference the virtualenv executable directly, to avoid the need + ;; for PYTHONPATH, which gets cleared when instantiating a new + ;; virtualenv with pytest-virtualenv. + (add-after 'unpack 'patch-virtualenv-executable + (lambda* (#:key inputs #:allow-other-keys) + (let* ((virtualenv (assoc-ref inputs "python-virtualenv")) + (virtualenv-bin (string-append virtualenv + "/bin/virtualenv"))) + (substitute* "pytest_virtualenv.py" + (("^DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE.*$") + (format #f "DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = '~a'" + virtualenv-bin))) + #t)))))) (propagated-inputs - `(("python-virtualenv" ,python-virtualenv) - ("python-pytest-shutil" ,python-pytest-shutil) + `(("python-pytest-shutil" ,python-pytest-shutil) ("python-pytest-fixture-config" ,python-pytest-fixture-config))) + (inputs + `(("python-virtualenv" ,python-virtualenv))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) |