Merge pull request #12744 from teh/p3boto

Fix boto3 build for Python 3 and 2.
This commit is contained in:
Frederik Rietdijk 2016-02-01 20:02:24 +01:00
commit 9dbe54afaf

View file

@ -2282,10 +2282,15 @@ in modules // {
};
propagatedBuildInputs = [ self.botocore
self.futures_2_2
self.jmespath
];
buildInputs = [ self.docutils ];
] ++ (if isPy3k then [] else [self.futures_2_2]);
buildInputs = [ self.docutils self.nose self.mock ];
# Tests are failing with `botocore.exceptions.NoCredentialsError:
# Unable to locate credentials`. There also seems to be some mock
# issues (`assert_called_once` doesn't exist in mock but boto
# seems to think it is?).
doCheck = false;
meta = {
homepage = https://github.com/boto3/boto;
@ -12520,7 +12525,7 @@ in modules // {
# Disable failing test_f2py test.
# f2py couldn't be found by test,
# even though it was used successfully to build numpy
# The large file support test is disabled because it takes forever
# and can cause the machine to run out of disk space when run.
prePatch = ''