Merge pull request #110474 from dotlambda/virtualenv-20.3.1

[staging] pythonPackages.virtualenv: 20.2.1 -> 20.3.1

authored by

Robert Schütz and committed by
GitHub
d98e2562 f92395cf

+61 -28
+2 -4
pkgs/development/python-modules/freezegun/0.3.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "freezegun"; 14 - version = "0.3.5"; 14 + version = "0.3.15"; 15 15 16 16 src = fetchPypi { 17 17 inherit pname version; 18 - sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; 18 + sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; 19 19 }; 20 20 21 21 propagatedBuildInputs = [ dateutil six ]; 22 22 checkInputs = [ mock nose pytest ]; 23 - # contains python3 specific code 24 - doCheck = !isPy27; 25 23 26 24 meta = with lib; { 27 25 description = "FreezeGun: Let your Python tests travel through time";
+5 -11
pkgs/development/python-modules/freezegun/default.nix
··· 2 2 , buildPythonPackage 3 3 , pythonOlder 4 4 , fetchPypi 5 - , isPy27 6 5 , dateutil 7 - , six 8 - , mock 9 - , nose 10 - , pytest 6 + , pytestCheckHook 11 7 }: 12 8 13 9 buildPythonPackage rec { 14 10 pname = "freezegun"; 15 - version = "1.0.0"; 11 + version = "1.1.0"; 16 12 disabled = pythonOlder "3.5"; 17 13 18 14 src = fetchPypi { 19 15 inherit pname version; 20 - sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643"; 16 + sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; 21 17 }; 22 18 23 - propagatedBuildInputs = [ dateutil six ]; 24 - checkInputs = [ mock nose pytest ]; 25 - # contains python3 specific code 26 - doCheck = !isPy27; 19 + propagatedBuildInputs = [ dateutil ]; 20 + checkInputs = [ pytestCheckHook ]; 27 21 28 22 meta = with lib; { 29 23 description = "FreezeGun: Let your Python tests travel through time";
+12 -5
pkgs/development/python-modules/pytest-freezegun/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 3 + , isPy27 4 + , fetchFromGitHub 4 5 , freezegun 5 6 , pytest 7 + , pytestCheckHook 6 8 }: 7 9 8 10 buildPythonPackage rec { 9 11 pname = "pytest-freezegun"; 10 12 version = "0.4.2"; 11 13 12 - src = fetchPypi { 13 - inherit pname version; 14 - extension = "zip"; 15 - sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; 14 + src = fetchFromGitHub { 15 + owner = "ktosiek"; 16 + repo = "pytest-freezegun"; 17 + rev = version; 18 + sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; 16 19 }; 17 20 18 21 propagatedBuildInputs = [ 19 22 freezegun 20 23 pytest 24 + ]; 25 + 26 + checkInputs = [ 27 + pytestCheckHook 21 28 ]; 22 29 23 30 meta = with lib; {
+42 -8
pkgs/development/python-modules/virtualenv/default.nix
··· 1 1 { buildPythonPackage 2 - , fetchPypi 3 - , lib 4 - , stdenv 5 - , pythonOlder 6 - , isPy27 7 2 , appdirs 8 3 , contextlib2 4 + , cython 9 5 , distlib 6 + , fetchPypi 10 7 , filelock 8 + , fish 9 + , flaky 11 10 , importlib-metadata 12 11 , importlib-resources 12 + , isPy27 13 + , lib 13 14 , pathlib2 15 + , pytest-freezegun 16 + , pytest-mock 17 + , pytest-timeout 18 + , pytestCheckHook 19 + , pythonOlder 14 20 , setuptools_scm 15 21 , six 22 + , stdenv 16 23 }: 17 24 18 25 buildPythonPackage rec { ··· 47 54 ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch 48 55 ]; 49 56 50 - meta = { 57 + checkInputs = [ 58 + cython 59 + fish 60 + flaky 61 + pytest-freezegun 62 + pytest-mock 63 + pytest-timeout 64 + pytestCheckHook 65 + ]; 66 + 67 + preCheck = '' 68 + export HOME=$(mktemp -d) 69 + ''; 70 + 71 + # Ignore tests which require network access 72 + disabledTestFiles = [ 73 + "tests/unit/create/test_creator.py" 74 + "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" 75 + ]; 76 + 77 + disabledTests = [ 78 + "test_can_build_c_extensions" 79 + "test_xonsh" # imports xonsh, which is not in pythonPackages 80 + ]; 81 + 82 + pythonImportsCheck = [ "virtualenv" ]; 83 + 84 + meta = with lib; { 51 85 description = "A tool to create isolated Python environments"; 52 86 homepage = "http://www.virtualenv.org"; 53 - license = lib.licenses.mit; 54 - maintainers = with lib.maintainers; [ goibhniu ]; 87 + license = licenses.mit; 88 + maintainers = with maintainers; [ goibhniu ]; 55 89 }; 56 90 }