From notifications-return-17286-archive-asf-public=cust-asf.ponee.io@libcloud.apache.org Sat Jul 11 15:19:27 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 86451180663 for ; Sat, 11 Jul 2020 17:19:27 +0200 (CEST) Received: (qmail 89787 invoked by uid 500); 11 Jul 2020 15:19:26 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 89735 invoked by uid 500); 11 Jul 2020 15:19:26 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 89730 invoked by uid 99); 11 Jul 2020 15:19:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jul 2020 15:19:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8F97B811D7; Sat, 11 Jul 2020 15:19:26 +0000 (UTC) Date: Sat, 11 Jul 2020 15:19:28 +0000 To: "commits@libcloud.apache.org" Subject: [libcloud] 02/08: Merge branch 'pricing-aws' of https://github.com/Eis-D-Z/libcloud into pricing-aws MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: tomaz@apache.org In-Reply-To: <159448076624.32575.4076433714300300194@gitbox.apache.org> References: <159448076624.32575.4076433714300300194@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: libcloud X-Git-Refname: refs/heads/trunk X-Git-Reftype: branch X-Git-Rev: 24a7da9a5013039b33ffe1a07e27682ccdbc640b X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200711151926.8F97B811D7@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. tomaz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/libcloud.git commit 24a7da9a5013039b33ffe1a07e27682ccdbc640b Merge: d3df881 bd5c777 Author: Eis AuthorDate: Mon Jul 6 18:14:46 2020 +0300 Merge branch 'pricing-aws' of https://github.com/Eis-D-Z/libcloud into pricing-aws CHANGES.rst | 18 + contrib/scrape-ec2-prices.py | 17 +- contrib/scrape-gce-prices.py | 523 + libcloud/compute/drivers/gce.py | 37 +- libcloud/compute/drivers/openstack.py | 61 +- libcloud/data/pricing.json | 14386 +++++++++---------- .../fixtures/openstack_v1.1/_images_v2.json | 2 +- ...images_v2.json => _images_v2_invalid_next.json} | 2 +- .../fixtures/openstack_v1.1/_images_v2_page2.json | 50 + libcloud/test/compute/test_openstack.py | 33 +- 10 files changed, 7530 insertions(+), 7599 deletions(-)