GitHub user mbrukman opened a pull request:
https://github.com/apache/libcloud/pull/630
[google] fix pricing script and test; fix build
Revert conditional import of simplejson to unconditional: the code as
implemented only works with simplejson and not the standard json library
because
it relies on the `item_sort_key` functionality which only simplejson
provides
and json does not.
Also fixes indentation which breaks the build since the linter is part of
the
tests.
Fixes the issues seen here:
* https://travis-ci.org/apache/libcloud/builds/90117628
* https://travis-ci.org/apache/libcloud/jobs/90117643
/cc: @erjohnso to review and merge.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/mbrukman/libcloud
google-cloud-pricing-json-fix-build
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/libcloud/pull/630.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #630
----
commit 866ae0a7aea9d270f332e37b7caa1a49dd78abd3
Author: Misha Brukman <mbruk...@google.com>
Date: 2015-11-09T22:28:21Z
[google] fix pricing script and test; fix build
Revert conditional import of simplejson to unconditional: the code as
implemented only works with simplejson and not the standard json library
because
it relies on the `item_sort_key` functionality which only simplejson
provides
and json does not.
Also fixes indentation which breaks the build since the linter is part of
the
tests.
Fixes the issues seen here:
* https://travis-ci.org/apache/libcloud/builds/90117628
* https://travis-ci.org/apache/libcloud/jobs/90117643
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
