Merge remote-tracking branch 'upstream/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/15ae4580 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/15ae4580 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/15ae4580 Branch: refs/heads/trunk Commit: 15ae45805dcef1d91498af33598ee5c2059c411a Parents: 3dd6f4d 2f7637e Author: micafer <[email protected]> Authored: Mon Dec 18 10:21:24 2017 +0100 Committer: micafer <[email protected]> Committed: Mon Dec 18 10:21:24 2017 +0100 ---------------------------------------------------------------------- .travis.yml | 10 - CHANGES.rst | 13 +- contrib/Dockerfile | 20 +- contrib/run_tests.sh | 2 +- docs/other/using-http-proxy.rst | 4 - docs/testing.rst | 7 +- libcloud/__init__.py | 4 +- libcloud/common/base.py | 11 +- libcloud/common/upcloud.py | 36 + libcloud/compute/drivers/ec2.py | 78 +++ libcloud/compute/drivers/upcloud.py | 24 +- libcloud/test/__init__.py | 7 +- libcloud/test/common/test_openstack.py | 11 +- libcloud/test/common/test_upcloud.py | 20 + .../compute/fixtures/upcloud/api_1_2_price.json | 683 +++++++++++++++++++ libcloud/test/compute/test_ec2.py | 6 +- libcloud/test/compute/test_upcloud.py | 25 +- libcloud/test/test_init.py | 2 +- libcloud/utils/py3.py | 55 +- setup.py | 16 +- tox.ini | 7 +- 21 files changed, 897 insertions(+), 144 deletions(-) ----------------------------------------------------------------------
