From 83c1e8a0201e6992da340acb78b53a2a234dbaa3 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 11:54:03 +0300 Subject: [PATCH 1/2] pythonPackages.bitbucket_api: fixes #19988 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37243a3e7ef..3075f30f3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2630,13 +2630,15 @@ in { bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; + # python3 does not support relative imports + disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz"; sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2"; }; - propagatedBuildInputs = with self; [ requests_oauth2 nose sh ]; + propagatedBuildInputs = with self; [ requests_oauthlib nose sh ]; doCheck = false; From a43f24cb4f096675a2d27980a3f0241feb0bf5d7 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 11:55:47 +0300 Subject: [PATCH 2/2] pythonPackages.requests_oauth2: refactors dependencies --- pkgs/top-level/python-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3075f30f3a3..48af01c54b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21702,13 +21702,17 @@ in { requests_oauth2 = buildPythonPackage rec { name = "requests-oauth2-0.1.1"; + # python3 does not support relative imports + disabled = isPy3k; src = pkgs.fetchurl { url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; - propagatedBuildInputs = with self; [ requests_oauthlib ]; + propagatedBuildInputs = with self; [ requests2 ]; + # no tests in tarball + doCheck = false; meta = { description = "Python's Requests OAuth2 (Open Authentication) plugin";