guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

40/131: gnu: python-django: Do not alter PYTHONPATH.


From: guix-commits
Subject: 40/131: gnu: python-django: Do not alter PYTHONPATH.
Date: Fri, 29 Jan 2021 09:21:53 -0500 (EST)

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit 24d65d8c04df4d9c513863ade5104e700d7ef954
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 00:19:29 2021 -0500

    gnu: python-django: Do not alter PYTHONPATH.
    
    * gnu/packages/django.scm (python-django): Remove trailing #t.
    [phases]{pre-check,check}: Do not alter PYTHONPATH.
---
 gnu/packages/django.scm | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index aa4411c..091d757 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -74,23 +74,10 @@
              (substitute* "tests/settings_tests/tests.py"
                ((".*def test_incorrect_timezone.*" all)
                 (string-append "    @unittest.skipIf(True, 'Disabled by 
Guix')\n"
-                               all)))
-
-             ;; Preserve the PYTHONPATH created by Guix when running the tests.
-             (substitute* "tests/admin_scripts/tests.py"
-               (("python_path = \\[")
-                (string-append "python_path = ['"
-                               (string-join
-                                (string-split (getenv "PYTHONPATH") #\:)
-                                "','")
-                               "', ")))
-
-             #t))
+                               all)))))
          (replace 'check
            (lambda _
              (with-directory-excursion "tests"
-               (setenv "PYTHONPATH"
-                       (string-append "..:" (getenv "PYTHONPATH")))
                (invoke "python" "runtests.py"
                        ;; By default tests run in parallel, which may cause
                        ;; various race conditions.  Run sequentially for



reply via email to

[Prev in Thread] Current Thread [Next in Thread]