diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-09 19:42:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 19:42:41 +0000 |
| commit | 75c5b8c01f8ed6891a7c3f11d1a445bfec30e053 (patch) | |
| tree | 73e63219ce1fd672189cfde99c811b32a21373cd /pkgs | |
| parent | 13dda44b8b5c30aea813ec2a2fcff6b6dd8a9b0f (diff) | |
| parent | d436d3dac538cd4d5ec44d8fbe951db41e6041a4 (diff) | |
| download | nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar.gz nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar.bz2 nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar.lz nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar.xz nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.tar.zst nixlib-75c5b8c01f8ed6891a7c3f11d1a445bfec30e053.zip | |
Merge pull request #34768 from dotlambda/dateparser
pythonPackages.dateparser: 0.6.0 -> 0.7.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/dateparser/default.nix | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 21deadf146dc..fdc408e1c4c1 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,47 +1,40 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k , nose , parameterized , mock , glibcLocales , six , jdatetime -, pyyaml , dateutil , umalqurra , pytz , tzlocal , regex , ruamel_yaml }: + buildPythonPackage rec { pname = "dateparser"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "scrapinghub"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; + src = fetchPypi { + inherit pname version; + sha256 = "940828183c937bcec530753211b70f673c0a9aab831e43273489b310538dff86"; }; - # 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 parameterized mock glibcLocales ]; + checkInputs = [ nose mock parameterized six glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py ''; - propagatedBuildInputs = [ six jdatetime pyyaml dateutil - umalqurra pytz tzlocal regex ruamel_yaml ]; + propagatedBuildInputs = [ + # install_requires + dateutil pytz regex tzlocal + # extra_requires + jdatetime ruamel_yaml umalqurra + ]; - meta = with stdenv.lib;{ + meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; homepage = https://github.com/scrapinghub/dateparser; license = licenses.bsd3; |