apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit c9c593b835c81d115336037c82bfd26fcffdee56 Author: Maxim Cournoyer <[email protected]> AuthorDate: Sat Jan 23 00:22:44 2021 -0500 gnu: python-pytest-django: Do not alter PYTHONPATH. * gnu/packages/django.scm (python-django): Remove trailing #t. [phases]{check}: Do not alter PYTHONPATH. --- gnu/packages/django.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 091d757..66f4362 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Vijayalakshmi Vedantham <[email protected]> ;;; Copyright © 2019 Sam <[email protected]> ;;; Copyright © 2020 Marius Bakke <[email protected]> +;;; Copyright © 2021 Maxim Cournoyer <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -309,23 +310,18 @@ size and quality.") (replace 'check (lambda* (#:key tests? inputs outputs #:allow-other-keys) (if tests? - (begin - (add-installed-pythonpath inputs outputs) - (setenv "PYTHONPATH" - (string-append ".:" ;for pytest_django_test - (getenv "PYTHONPATH"))) - (setenv "PYTEST_DJANGO_TEST_RUNNER" "pytest") - (setenv "DJANGO_SETTINGS_MODULE" - "pytest_django_test.settings_sqlite_file") - (invoke "pytest" "-vv" "-k" - ;; FIXME: these tests fail to locate Django templates ... - (string-append "not test_django_not_loaded_without_settings" - " and not test_settings" - ;; ... and this does not discover - ;; 'pytest_django_test'. - " and not test_urls_cache_is_cleared"))) - (format #t "test suite not run~%")) - #t))))) + (begin + (setenv "PYTEST_DJANGO_TEST_RUNNER" "pytest") + (setenv "DJANGO_SETTINGS_MODULE" + "pytest_django_test.settings_sqlite_file") + (invoke "python" "-m" "pytest" "-vv" "-k" + ;; FIXME: these tests fail to locate Django templates ... + (string-append "not test_django_not_loaded_without_settings" + " and not test_settings" + ;; ... and this does not discover + ;; 'pytest_django_test'. + " and not test_urls_cache_is_cleared"))) + (format #t "test suite not run~%"))))))) (native-inputs `(("python-django" ,python-django) ("python-setuptools-scm" ,python-setuptools-scm)
