diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-06 16:23:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 16:23:58 +0000 |
| commit | ec26c65bce6c3e70b2217a98b71be88c333698d4 (patch) | |
| tree | ed73aa9c7fe08ca003c751ec74461de1778343ed | |
| parent | ba3d1c0814b14e01e69cb2030b54d5c1ee377cb9 (diff) | |
| parent | 029fa375c8188c561eb74d8a08d12a78b4a34f0c (diff) | |
| download | nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar.gz nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar.bz2 nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar.lz nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar.xz nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.tar.zst nixlib-ec26c65bce6c3e70b2217a98b71be88c333698d4.zip | |
Merge pull request #34643 from dotlambda/dateparser
pythonPackages.dateparser: switch to parameterized and thereby fix Hydra test
| -rw-r--r-- | pkgs/development/python-modules/dateparser/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/python-modules/nose-parameterized/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
3 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index b73a1e9ec7fc..21deadf146dc 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, isPy3k , nose -, nose-parameterized +, parameterized , mock , glibcLocales , six @@ -23,10 +23,16 @@ buildPythonPackage rec { 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 disabled = isPy3k; - checkInputs = [ nose nose-parameterized mock glibcLocales ]; + checkInputs = [ nose parameterized mock glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix deleted file mode 100644 index 77b540fdef06..000000000000 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ fetchPypi, parameterized }: - -parameterized.overrideAttrs (o: rec { - pname = "nose-parameterized"; - version = "0.6.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; - }; -}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcf64b9629df..7db8d5c2cd97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { name = "NeuroTools-${version}"; version = "0.3.1"; |