Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 24f8f41

Browse files
authoredMay 8, 2021
Revert "python3Packages.monty: add missing pydanctic and tqdm dependencies"
This reverts commit adb0cf0.
1 parent d03a5eb commit 24f8f41

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed
 

Diff for: ‎pkgs/development/python-modules/monty/default.nix

+16-23
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
{ lib
22
, buildPythonPackage
33
, fetchFromGitHub
4-
, pythonOlder
5-
, msgpack
4+
, isPy27
65
, nose
76
, numpy
8-
, pydantic
9-
, pymongo
7+
, six
108
, ruamel_yaml
11-
, tqdm
9+
, msgpack
10+
, coverage
11+
, coveralls
12+
, pymongo
13+
, lsof
1214
}:
1315

1416
buildPythonPackage rec {
1517
pname = "monty";
1618
version = "2021.3.3";
17-
disabled = pythonOlder "3.5"; # uses type annotations
19+
disabled = isPy27; # uses type annotations
1820

1921
# No tests in Pypi
2022
src = fetchFromGitHub {
@@ -24,30 +26,21 @@ buildPythonPackage rec {
2426
sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l";
2527
};
2628

27-
propagatedBuildInputs = [
28-
ruamel_yaml
29-
tqdm
30-
msgpack
31-
];
29+
checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
30+
propagatedBuildInputs = [ six ruamel_yaml ];
3231

33-
checkInputs = [
34-
nose
35-
numpy
36-
pydantic
37-
pymongo
38-
];
32+
# test suite tries to decode bytes, but msgpack now returns a str
33+
# https://github.com/materialsvirtuallab/monty/pull/121
34+
postPatch = ''
35+
substituteInPlace tests/test_serialization.py \
36+
--replace ".decode('utf-8')" ""
37+
'';
3938

4039
preCheck = ''
4140
substituteInPlace tests/test_os.py \
4241
--replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
4342
'';
4443

45-
checkPhase = ''
46-
runHook preCheck
47-
nosetests -v
48-
runHook postCheck
49-
'';
50-
5144
meta = with lib; {
5245
description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
5346
longDescription = "

0 commit comments

Comments
 (0)
Please sign in to comment.