diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
| commit | 45431c078bf8f54aef7c9fae2e5913395ec82c31 (patch) | |
| tree | fd8ff1346a963ddd72e782421f05b623f9759e2a /nixpkgs/pkgs/development/python-modules/fs | |
| parent | c86fea6086c212ea489cfb023a5f5c9c8f188810 (diff) | |
| parent | 3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5 (diff) | |
Merge commit '3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5' into fuckthisshit
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/fs')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/fs/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/fs/default.nix b/nixpkgs/pkgs/development/python-modules/fs/default.nix index cbbb8886846..fee20021e1a 100644 --- a/nixpkgs/pkgs/development/python-modules/fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fs/default.nix @@ -15,19 +15,20 @@ , mock , pythonAtLeast , isPy3k +, pytest }: buildPythonPackage rec { pname = "fs"; - version = "2.4.8"; + version = "2.4.11"; src = fetchPypi { inherit pname version; - sha256 = "5e19251e939b10d50e4b58b0cf2862851794abcf4aa4387b67c69dd61e97b3dc"; + sha256 = "cc99d476b500f993df8ef697b96dc70928ca2946a455c396a566efe021126767"; }; buildInputs = [ glibcLocales ]; - checkInputs = [ nose pyftpdlib mock psutil ]; + checkInputs = [ nose pyftpdlib mock psutil pytest ]; propagatedBuildInputs = [ six appdirs pytz ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] @@ -37,7 +38,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf-8"; checkPhase = '' - HOME=$(mktemp -d) nosetests tests [] + HOME=$(mktemp -d) pytest -k 'not user_data_repr' --ignore=tests/test_opener.py ''; meta = with lib; { |