Merge pull request #34643 from dotlambda/dateparser
pythonPackages.dateparser: switch to parameterized and thereby fix Hydra test
This commit is contained in:
commit
ec26c65bce
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k
|
{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k
|
||||||
, nose
|
, nose
|
||||||
, nose-parameterized
|
, parameterized
|
||||||
, mock
|
, mock
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, six
|
, six
|
||||||
@ -23,10 +23,16 @@ buildPythonPackage rec {
|
|||||||
sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y";
|
sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Replace nose-parameterized by parameterized
|
||||||
|
prePatch = ''
|
||||||
|
sed -i s/nose_parameterized/parameterized/g tests/*.py
|
||||||
|
sed -i s/nose-parameterized/parameterized/g tests/requirements.txt
|
||||||
|
'';
|
||||||
|
|
||||||
# Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364
|
# Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364
|
||||||
disabled = isPy3k;
|
disabled = isPy3k;
|
||||||
|
|
||||||
checkInputs = [ nose nose-parameterized mock glibcLocales ];
|
checkInputs = [ nose parameterized mock glibcLocales ];
|
||||||
preCheck =''
|
preCheck =''
|
||||||
# skip because of missing convertdate module, which is an extra requirement
|
# skip because of missing convertdate module, which is an extra requirement
|
||||||
rm tests/test_jalali.py
|
rm tests/test_jalali.py
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
{ fetchPypi, parameterized }:
|
|
||||||
|
|
||||||
parameterized.overrideAttrs (o: rec {
|
|
||||||
pname = "nose-parameterized";
|
|
||||||
version = "0.6.0";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk";
|
|
||||||
};
|
|
||||||
})
|
|
@ -3842,9 +3842,6 @@ in {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead."
|
|
||||||
(callPackage ../development/python-modules/nose-parameterized {});
|
|
||||||
|
|
||||||
neurotools = buildPythonPackage (rec {
|
neurotools = buildPythonPackage (rec {
|
||||||
name = "NeuroTools-${version}";
|
name = "NeuroTools-${version}";
|
||||||
version = "0.3.1";
|
version = "0.3.1";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user