summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2021-05-08 09:46:44 +0200
committerGitHub <noreply@github.com>2021-05-08 09:46:44 +0200
commit24f8f41f40a16ca9f92b331588929feeeb04f158 (patch)
tree12631bc9b27b702961abc9735640839ac196df75
parentaioamqp: fix build (diff)
downloadnixpkgs-origin/revert-122097-python/monty.tar.gz
Revert "python3Packages.monty: add missing pydanctic and tqdm dependencies"origin/revert-122097-python/monty
This reverts commit adb0cf013fa7fdc595eb42a48734ea01fb0eed46.
-rw-r--r--pkgs/development/python-modules/monty/default.nix39
1 files changed, 16 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 53f139dde343..a2398ce750dd 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -1,20 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pythonOlder
-, msgpack
+, isPy27
, nose
, numpy
-, pydantic
-, pymongo
+, six
, ruamel_yaml
-, tqdm
+, msgpack
+, coverage
+, coveralls
+, pymongo
+, lsof
}:
buildPythonPackage rec {
pname = "monty";
version = "2021.3.3";
- disabled = pythonOlder "3.5"; # uses type annotations
+ disabled = isPy27; # uses type annotations
# No tests in Pypi
src = fetchFromGitHub {
@@ -24,30 +26,21 @@ buildPythonPackage rec {
sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l";
};
- propagatedBuildInputs = [
- ruamel_yaml
- tqdm
- msgpack
- ];
+ checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
+ propagatedBuildInputs = [ six ruamel_yaml ];
- checkInputs = [
- nose
- numpy
- pydantic
- pymongo
- ];
+ # test suite tries to decode bytes, but msgpack now returns a str
+ # https://github.com/materialsvirtuallab/monty/pull/121
+ postPatch = ''
+ substituteInPlace tests/test_serialization.py \
+ --replace ".decode('utf-8')" ""
+ '';
preCheck = ''
substituteInPlace tests/test_os.py \
--replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
'';
- checkPhase = ''
- runHook preCheck
- nosetests -v
- runHook postCheck
- '';
-
meta = with lib; {
description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
longDescription = "