diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-12 03:16:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-12 03:16:46 +0200 |
commit | 1bbb088829fec088720df3152b36d89bddc5249c (patch) | |
tree | 4c093410be1defb4ede64830bee8dc3e37c10859 /pkgs | |
parent | 0fefa426782e96e45d55b9e2a45192f0b2a089cf (diff) | |
parent | 6e7740fb0cca900330532d77e6dfdffe7645272e (diff) | |
download | nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar.gz nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar.bz2 nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar.lz nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar.xz nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.tar.zst nixpkgs-1bbb088829fec088720df3152b36d89bddc5249c.zip |
Merge pull request #116831 from oxzi/watson-2.0.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/watson/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/python-modules/arrow/1.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 47 insertions, 8 deletions
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 18c1b9469e7..c305c771417 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,26 +4,22 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1s0k86ldqky6avwjaxkw1y02wyf59qwqldcahy3lhjn1b5dgsb3s"; + sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; }; - checkPhase = '' - pytest -vs tests - ''; - postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; + propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { diff --git a/pkgs/development/python-modules/arrow/1.nix b/pkgs/development/python-modules/arrow/1.nix new file mode 100644 index 00000000000..f9b830762b3 --- /dev/null +++ b/pkgs/development/python-modules/arrow/1.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, simplejson, typing-extensions, python-dateutil, pytz, pytest-mock, sphinx +, dateparser, pytestcov, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arrow"; + version = "1.0.3"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r"; + }; + + propagatedBuildInputs = [ python-dateutil ] + ++ lib.optionals (!pythonOlder "3.8") [ typing-extensions ]; + + checkInputs = [ + dateparser + pytestCheckHook + pytestcov + pytest-mock + pytz + simplejson + sphinx + ]; + + # ParserError: Could not parse timezone expression "America/Nuuk" + disabledTests = [ + "test_parse_tz_name_zzz" + ]; + + meta = with lib; { + description = "Python library for date manipulation"; + homepage = "https://github.com/crsmithdev/arrow"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice oxzi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fc8843a07d..bf5777629be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -495,6 +495,8 @@ in { arrow = callPackage ../development/python-modules/arrow { }; + arrow_1 = callPackage ../development/python-modules/arrow/1.nix { }; + arviz = callPackage ../development/python-modules/arviz { }; arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; |