guix-commits
[Top][All Lists]
Advanced

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

44/57: gnu: python-tox: Simplify.


From: guix-commits
Subject: 44/57: gnu: python-tox: Simplify.
Date: Thu, 19 Dec 2024 06:31:43 -0500 (EST)

rekado pushed a commit to branch python-team
in repository guix.

commit e363be83fca45ca6341af2c7b30982c4f61b23f4
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Dec 17 13:46:06 2024 +0100

    gnu: python-tox: Simplify.
    
    * gnu/packages/python-check.scm (python-tox)[arguments]: Enable more tests;
    remove phase 'virtualenv-compatibility.
    
    Change-Id: I39a637cfc2385da74c11fc82ea811a26cf5f849a
---
 gnu/packages/python-check.scm | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 706736b30c..e8efb96f5f 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2949,46 +2949,13 @@ Python file for configuration.")
                    '( ;; These freeze the test suite
                      "parallel"
                      "parallel_live"
-
-                     ;; These fail with: Directory cannot be installed in
-                     ;; editable mode
-                     "skip_missing_interpreters"
-                     "skip_missing_interpreters_specified_env"
-                     ;; assert 0 == -1
-                     "config_skip_missing_interpreters"
-                     ;; KeyError: 'env'
-                     "legacy_cli_flags"
-                     ;; AssertionError: should be None, got code: 0
-                     "missing_interpreter_skip_on"
-                     "missing_interpreter_skip_off"
-                     ;; Unexplainable diff
-                     "skip_develop_mode"
-                     "show_config_exception"
+                     ;; Needs internet access
+                     "build_wheel_external"
+                     "run_installpkg_targz"
                      "python_generate_hash_seed"
                      ;; XXX Tries to call python-wrapper-3.10.7/bin/tox
-                     "call_as_exe"
-                     "usedevelop_with_nonexistent_basepython"))
-              " and ")
-             ;; XXX Our version of virtualenv is too old.
-             "--ignore-glob=tests/tox_env/python/virtual_env/*")
-      #:phases
-      '(modify-phases %standard-phases
-         (add-after 'unpack 'virtualenv-compatibility
-           (lambda _
-             (setenv "HOME" "/tmp")
-             ;; XXX: Our version of virtualenv does not like this extra
-             ;; keyword argument.
-             (substitute* "src/tox/tox_env/python/virtual_env/api.py"
-               (("session_via_cli\\(env_dir, options=None, 
setup_logging=False, env=env\\)")
-                "session_via_cli(env_dir, options=None, setup_logging=False)"))
-             ;; XXX: This is a real problem, but we cannot fix it without
-             ;; affecting thousands of packages.
-             (substitute* "pyproject.toml"
-               (("virtualenv>=20.26.6") "virtualenv>=20.3.0")
-               (("typing-extensions>=4.12.2") "typing-extensions>=4.10.0")
-               (("platformdirs>=4.3.6") "platformdirs>=4.2.0")
-               (("colorama>=0.4.6") "colorama>=0.4.4")
-               (("chardet>=5.2") "chardet>=5.1.0")))))))
+                     "call_as_exe"))
+              " and "))))
     (propagated-inputs
      (list python-cachetools
            python-chardet



reply via email to

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