commit 08aed995eaf3f3c9b3ab729cee2a0c1a33db97af · pyrox.dev/nixpkgs

+12 -12

pkgs/development/interpreters/python/tests.nix

···

       19
       19
        
         # we aim to support.

     

       20
       20
        
         environmentTests =

     

       21
       21
        
           let

     

       22
       22
       -
             envs =

     

       22
       22
       +
             environments =

     

       23
       23
        
               let

     

       24
       24
        
                 inherit python;

     

       25
       25
        
                 pythonEnv = python.withPackages (ps: with ps; [ ]);

     
···

       36
       36
        
               {

     

       37
       37
        
                 # Plain Python interpreter

     

       38
       38
        
                 plain = rec {

     

       39
       39
       -
                   env = python;

     

       40
       40
       -
                   interpreter = env.interpreter;

     

       39
       39
       +
                   environment = python;

     

       40
       40
       +
                   interpreter = environment.interpreter;

     

       41
       41
        
                   is_venv = "False";

     

       42
       42
        
                   is_nixenv = "False";

     

       43
       43
        
                   is_virtualenv = "False";

     
···

       48
       48
        
                 # Fails on darwin with

     

       49
       49
        
                 #   virtualenv: error: argument dest: the destination . is not write-able at /nix/store

     

       50
       50
        
                 nixenv-virtualenv = rec {

     

       51
       51
       -
                   env = runCommand "${python.name}-virtualenv" { } ''

     

       51
       51
       +
                   environment = runCommand "${python.name}-virtualenv" { } ''

     

       52
       52
        
                     ${pythonVirtualEnv.interpreter} -m virtualenv venv

     

       53
       53
        
                     mv venv $out

     

       54
       54
        
                   '';

     

       55
       55
       -
                   interpreter = "${env}/bin/${python.executable}";

     

       55
       55
       +
                   interpreter = "${environment}/bin/${python.executable}";

     

       56
       56
        
                   is_venv = "False";

     

       57
       57
        
                   is_nixenv = "True";

     

       58
       58
        
                   is_virtualenv = "True";

     
···

       61
       61
        
               // lib.optionalAttrs (python.implementation != "graal") {

     

       62
       62
        
                 # Python Nix environment (python.buildEnv)

     

       63
       63
        
                 nixenv = rec {

     

       64
       64
       -
                   env = pythonEnv;

     

       65
       65
       -
                   interpreter = env.interpreter;

     

       64
       64
       +
                   environment = pythonEnv;

     

       65
       65
       +
                   interpreter = environment.interpreter;

     

       66
       66
        
                   is_venv = "False";

     

       67
       67
        
                   is_nixenv = "True";

     

       68
       68
        
                   is_virtualenv = "False";

     
···

       73
       73
        
                 # Python 2 does not support venv

     

       74
       74
        
                 # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.

     

       75
       75
        
                 plain-venv = rec {

     

       76
       76
       -
                   env = runCommand "${python.name}-venv" { } ''

     

       76
       76
       +
                   environment = runCommand "${python.name}-venv" { } ''

     

       77
       77
        
                     ${python.interpreter} -m venv $out

     

       78
       78
        
                   '';

     

       79
       79
       -
                   interpreter = "${env}/bin/${python.executable}";

     

       79
       79
       +
                   interpreter = "${environment}/bin/${python.executable}";

     

       80
       80
        
                   is_venv = "True";

     

       81
       81
        
                   is_nixenv = "False";

     

       82
       82
        
                   is_virtualenv = "False";

     
···

       88
       88
        
                 # TODO: Cannot create venv from a  nix env

     

       89
       89
        
                 # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.

     

       90
       90
        
                 nixenv-venv = rec {

     

       91
       91
       -
                   env = runCommand "${python.name}-venv" { } ''

     

       91
       91
       +
                   environment = runCommand "${python.name}-venv" { } ''

     

       92
       92
        
                     ${pythonEnv.interpreter} -m venv $out

     

       93
       93
        
                   '';

     

       94
       94
       -
                   interpreter = "${env}/bin/${pythonEnv.executable}";

     

       94
       94
       +
                   interpreter = "${environment}/bin/${pythonEnv.executable}";

     

       95
       95
        
                   is_venv = "True";

     

       96
       96
        
                   is_nixenv = "True";

     

       97
       97
        
                   is_virtualenv = "False";

     
···

       117
       117
        
                 '';

     

       118
       118
        
       

     

       119
       119
        
           in

     

       120
       120
       -
           lib.mapAttrs testfun envs;

     

       120
       120
       +
           lib.mapAttrs testfun environments;

     

       121
       121
        
       

     

       122
       122
        
         # Integration tests involving the package set.

     

       123
       123
        
         # All PyPy package builds are broken at the moment

+1 -1

pkgs/development/interpreters/python/tests/test_environments/test_python.py

···

       12
       12
        
       import site

     

       13
       13
        
       

     

       14
       14
        
       

     

       15
       15
       -
       ENV = "@env@"

     

       15
       15
       +
       ENV = "@environment@"

     

       16
       16
        
       INTERPRETER = "@interpreter@"

     

       17
       17
        
       PYTHON_VERSION = "@pythonVersion@"

     

       18
       18