Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da25268ca2c9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c98d6ce51f1e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2021

  1. Revert "python3Packages.virtualenv: enable tests" 

    This reverts commit c030d1b.
    Jonathan Ringer committed Jan 19, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    GPG key ID: 5C841D3CFDFEC4E0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    135a14f View commit details

  2. Revert "python3Packages.virtualenv: 20.2.1 -> 20.3.1" 

    This reverts commit 8623581.
    Jonathan Ringer committed Jan 19, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    GPG key ID: 5C841D3CFDFEC4E0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c98d6ce View commit details
Showing with 10 additions and 41 deletions.
  1. +10 −41 pkgs/development/python-modules/virtualenv/default.nix
51 changes: 10 additions & 41 deletions pkgs/development/python-modules/virtualenv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
{ buildPythonPackage
, fetchPypi
, lib
, stdenv
, pythonOlder
, isPy27
, appdirs
, contextlib2
, cython
, distlib
, fetchPypi
, filelock
, fish
, flaky
, importlib-metadata
, importlib-resources
, isPy27
, lib
, pathlib2
, pytest-freezegun
, pytest-mock
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools_scm
, six
, stdenv
, xonsh
}:

buildPythonPackage rec {
pname = "virtualenv";
version = "20.3.1";
version = "20.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk=";
sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
};

nativeBuildInputs = [
@@ -55,33 +47,10 @@ buildPythonPackage rec {
./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
];

checkInputs = [
cython
fish
flaky
pytest-freezegun
pytest-mock
pytest-timeout
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.9") [
xonsh
];

preCheck = "export HOME=$(mktemp -d)";

# Ignore tests which requires network access
pytestFlagsArray = [
"--ignore tests/unit/create/test_creator.py"
"--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
];

disabledTests = [ "test_can_build_c_extensions" ];
pythonImportsCheck = [ "virtualenv" ];

meta = with lib; {
meta = {
description = "A tool to create isolated Python environments";
homepage = "http://www.virtualenv.org";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ goibhniu ];
};
}