diff -pruN 7.0.7-1/AUTHORS 7.0.7-0ubuntu2/AUTHORS --- 7.0.7-1/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/AUTHORS 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,13 @@ +Julien Danjou +Martin Mágr +Mehdi Abaakouk +Olivier Destras +Pavlo Shchelokovskyy +Rabi Mishra +apetrich +billaud +gord chung <5091603+chungg@users.noreply.github.com> +gord chung +mergify-bot +mergify[bot] +sum12 diff -pruN 7.0.7-1/ChangeLog 7.0.7-0ubuntu2/ChangeLog --- 7.0.7-1/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/ChangeLog 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,90 @@ +CHANGES +======= + +7.0.7 +----- + +* Don't use '\*/\*' in accept header +* Fix pep8 E741 errors +* fix: make README compatible with PyPI + +7.0.6 +----- + +* FIX Bug on workaround missing OS\_AUTH\_TYPE +* Remove deprecated cli options +* fix pep8 +* pep8: fix RST304 errors +* pep8: enable logging format checks + +7.0.4 +----- + +* Remove hacking dependency for pep8 +* tests: remove testtools and fixtures dependencies +* exeptions: fix matching when description is a dict +* Support Python 3.7 instead of 3.5 + +7.0.3 +----- + +* shell: fix OS\_AUTH\_TYPE workaround + +7.0.2 +----- + +* Always use proxy method to get client +* Update mergify configuration +* Update mergify configuration +* Enable mergify +* Fix regression with exoic timestamp +* exceptions: remove MutipleMeaningException class +* Avoid using openstack-doc-tools +* tests: adapt status tests output +* status: add metricd processor report + +7.0.1 +----- + +* Set the Cliff namespace +* Use Python 3 for docs and pep8 test target +* resource-type: fixed attributes specific options of resource-type +* Remove outdated tox-travis configuration + +7.0.0 +----- + +* Pass explicit kwargs to metric.create +* Add "server version" client +* tests: fix tests not specifying UTC +* metric: reduce output on metric show +* tests: fix start/stop timestamp not being in UTC +* Only run tests on pull requests + +6.0.0 +----- + +* aggregates: new output parsing +* Remove client side query parsing +* tests: use a random metric name +* tests: use a fixture to fake TZ in environ +* Show and parse timestamps in local timezone by default +* shell: workaround missing OS\_AUTH\_TYPE when using Keystone auth +* add aggregates API +* Make build\_pagination\_options return a dict +* Update mailmap entries for sileht and gord +* tests: move to pytest +* metric: add support for metric pagination by default +* Fix osc client +* Clear .gitignore +* Use pretty\_tox to run tests +* Remove tempest dependency +* metric\_cli: convert datetime before returning +* Add archive-policy-rule update + +5.0.0 +----- + +* Fix exception name for keystoneauth1 +* metric: parse ISO8601 as datetime Python objects +* benchmark: generate just enough point for a batch diff -pruN 7.0.7-1/debian/bin/gnocchi 7.0.7-0ubuntu2/debian/bin/gnocchi --- 7.0.7-1/debian/bin/gnocchi 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/bin/gnocchi 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh - -export LANG=C.UTF-8 -export LC_ALL=C.UTF-8 - -gnocchi-real $@ diff -pruN 7.0.7-1/debian/bin/gnocchi-real 7.0.7-0ubuntu2/debian/bin/gnocchi-real --- 7.0.7-1/debian/bin/gnocchi-real 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/bin/gnocchi-real 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/usr/bin/python3 - -import sys - -from gnocchiclient.shell import main - - -if __name__ == "__main__": - sys.exit(main()) diff -pruN 7.0.7-1/debian/changelog 7.0.7-0ubuntu2/debian/changelog --- 7.0.7-1/debian/changelog 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/changelog 2021-06-23 08:04:27.000000000 +0000 @@ -1,135 +1,155 @@ -python-gnocchiclient (7.0.7-1) experimental; urgency=medium +python-gnocchiclient (7.0.7-0ubuntu2) impish; urgency=medium - * New upstream release. + * d/control: Drop python-pbr, python2 build depends. - -- Thomas Goirand Sun, 14 Mar 2021 16:04:48 +0100 + -- Chris MacNaughton Wed, 23 Jun 2021 08:04:27 +0000 -python-gnocchiclient (7.0.6-1) unstable; urgency=medium +python-gnocchiclient (7.0.7-0ubuntu1) hirsute; urgency=medium - * New upstream release. - * Fixed debian/watch. - * Add a debian/salsa-ci.yml. + [ Chris MacNaughton ] + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. - -- Thomas Goirand Fri, 16 Oct 2020 12:21:03 +0200 + [ Corey Bryant ] + * New upstream release for OpenStack Wallaby. -python-gnocchiclient (7.0.4-3) unstable; urgency=medium + -- Corey Bryant Mon, 22 Mar 2021 16:40:43 -0400 - [ Ondřej Nový ] - * Use debhelper-compat instead of debian/compat. +python-gnocchiclient (7.0.6-0ubuntu1) groovy; urgency=medium + + [ Chris MacNaughton ] + * New upstream release for OpenStack Victoria. + * d/control: Update Standards-Version to 4.5.0. + * d/control: Bump debhelper compat to 12. + + [ Corey Bryant ] + * d/control, d/rules, d/compat: Switch to debhelper compat 12 and pybuild. - [ Thomas Goirand ] - * Uploading to unstable. + -- Corey Bryant Mon, 15 Jun 2020 16:16:42 -0400 - -- Thomas Goirand Mon, 21 Oct 2019 01:19:40 +0200 +python-gnocchiclient (7.0.5-0ubuntu2) eoan; urgency=medium -python-gnocchiclient (7.0.4-2) unstable; urgency=medium + * Drop Python 2 support: + - d/control: Drop python-gnocchiclient binary package. + - d/control: Drop BDI's on python-*. + - d/control: Switch doc generation to python3-sphinx. + - d/rules: Skip install and test of Python 2 module. + - d/*.postinst,prerm,postrm: Drop maintainer scripts as binaries + no longer managed by alternatives. + * d/p/py3-compat.patch: Minor compat patch for generation of + documentation under Python 3. - * Uploading to unstable. + -- James Page Thu, 11 Jul 2019 07:39:14 +0100 - -- Thomas Goirand Wed, 17 Jul 2019 05:01:34 +0200 +python-gnocchiclient (7.0.5-0ubuntu1) disco; urgency=medium -python-gnocchiclient (7.0.4-1) experimental; urgency=medium + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. + * d/rules: Ensure python3 shebangs are set to /usr/bin/python3. + * d/p/drop-ujson.patch: Rebased. + + -- Corey Bryant Wed, 14 Nov 2018 12:23:33 -0500 + +python-gnocchiclient (7.0.1-0ubuntu1) bionic; urgency=medium - * Add bash-completion script. * New upstream release. - * Removed Python 2 support. + * d/control: Bump debhelper compat to 10. + * d/control: Align (Build-)Depends with upstream. + * d/p/drop-ujson.patch: Rebased. + + -- Corey Bryant Tue, 20 Feb 2018 16:03:30 -0500 + +python-gnocchiclient (6.0.0-0ubuntu3) bionic; urgency=medium - -- Thomas Goirand Tue, 26 Mar 2019 09:56:04 +0100 + * d/p/drop-ujson.patch: Refactor for upstream submission. -python-gnocchiclient (7.0.2-2) unstable; urgency=medium + -- James Page Wed, 03 Jan 2018 14:55:28 +0000 - * Uploading to unstable. +python-gnocchiclient (6.0.0-0ubuntu2) bionic; urgency=medium - -- Thomas Goirand Tue, 04 Sep 2018 23:24:38 +0200 + * d/p/drop-ujson.patch,d/control: Drop requirement for ujson until + supportability concerns are resolved. -python-gnocchiclient (7.0.2-1) experimental; urgency=medium + -- James Page Wed, 03 Jan 2018 10:44:37 +0000 +python-gnocchiclient (6.0.0-0ubuntu1) bionic; urgency=medium + + * d/watch: Use pypi.debian.net for upstream releases. * New upstream release. - * Fixed (build-)depends for this release. - * Using Python 3 for building the doc. + * d/control,d/p/drop-ujson.patch: Switch back to ujson as MIR is now + in progress for bionic. + * d/control: Align (Build-)Depends with upstream. + * d/*: wrap-and-sort -bast. + * d/rules: Switch to using pytest for unit tests. + * d/control: Bumped Standards-Version to 4.1.2. - -- Thomas Goirand Wed, 22 Aug 2018 00:00:18 +0200 + -- James Page Thu, 14 Dec 2017 15:20:13 +0000 -python-gnocchiclient (7.0.1-5) unstable; urgency=medium +python-gnocchiclient (3.3.1-0ubuntu2) artful; urgency=medium - [ Ondřej Nový ] - * d/control: Use team+openstack@tracker.debian.org as maintainer + * d/p/drop-ujson.patch, d/control, d/pydist-overrides: Drop ujson + in favor of json as ujson is not in main. - [ Thomas Goirand ] - * Add (build-)depends on python3-distutils (Closes: #905356). + -- Corey Bryant Thu, 24 Aug 2017 08:53:54 -0400 - -- Thomas Goirand Tue, 14 Aug 2018 14:14:00 +0000 +python-gnocchiclient (3.3.1-0ubuntu1) artful; urgency=medium -python-gnocchiclient (7.0.1-4) unstable; urgency=medium + * d/watch: Get tarball from github.com/gnocchixyz/python-gnocchiclient. + * New upstream release. + * d/control: Align (Build-)Depends with upstream. + * d/p/*: Rebased. - * Python 3 has now priority over Python 2. + -- Corey Bryant Wed, 16 Aug 2017 13:51:16 -0400 - -- Thomas Goirand Sun, 11 Mar 2018 13:04:15 +0100 +python-gnocchiclient (3.1.1-0ubuntu2) zesty; urgency=medium -python-gnocchiclient (7.0.1-3) unstable; urgency=medium + * d/patches/autogen-doc-disable.patch: Fix ftbfs. - * Add do-not-use-numprocesses-pytest-option.patch. + -- Chuck Short Mon, 06 Mar 2017 10:35:44 -0500 - -- Thomas Goirand Tue, 27 Feb 2018 00:21:45 +0000 +python-gnocchiclient (3.1.1-0ubuntu1) zesty; urgency=medium -python-gnocchiclient (7.0.1-2) unstable; urgency=medium + * New upstream release. + * d/control: Add python-openstack-doc-tools as dependency. - [ Ondřej Nový ] - * Running wrap-and-sort -bast + -- Chuck Short Fri, 03 Mar 2017 09:13:05 -0500 - [ Thomas Goirand ] - * Uploading to unstable. +python-gnocchiclient (2.8.2-0ubuntu1) zesty; urgency=medium - -- Thomas Goirand Sun, 25 Feb 2018 21:51:26 +0000 + * New upstream version. -python-gnocchiclient (7.0.1-1) experimental; urgency=medium + -- Chuck Short Wed, 18 Jan 2017 07:37:53 -0500 - [ Ondřej Nový ] - * d/control: Set Vcs-* to salsa.debian.org +python-gnocchiclient (2.8.1-0ubuntu1) zesty; urgency=medium - [ Thomas Goirand ] - * New upstream release. - * Fixed (build-)depends for this release, and using pytest instead of testr. - * Standards-Version is now 4.1.3. + * New upstream version. - -- Thomas Goirand Tue, 13 Feb 2018 08:45:45 +0000 + -- Chuck Short Tue, 17 Jan 2017 09:28:50 -0500 -python-gnocchiclient (3.3.1-2) unstable; urgency=medium +python-gnocchiclient (2.8.0-0ubuntu1) zesty; urgency=medium - * Uploading to unstable. - * Fix defining $PATH when building doc. - * Fixed build-depends version of openstack-doc-tools - * Fixed missing locales setup when building the sphinx doc (Closes: #880131). - * Fixed shebang for python3 to be python3, not python3.x. + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * debian/watch: Use tarballs.openstack.org to fetch tarball. + * New upstream version. + * d/control: Align (Build-)Depends with upstream. + * d/control: Add autopkgtest. - -- Thomas Goirand Tue, 31 Oct 2017 19:13:47 +0000 + -- Chuck Short Thu, 12 Jan 2017 09:51:14 -0500 -python-gnocchiclient (3.3.1-1) experimental; urgency=medium +python-gnocchiclient (2.5.0-0ubuntu1) yakkety; urgency=medium [ Ondřej Nový ] * Standards-Version is 3.9.8 now (no change) * d/rules: Removed UPSTREAM_GIT with default value - [ Daniel Baumann ] - * Updating vcs fields. - * Updating copyright format url. - * Running wrap-and-sort -bast. - * Updating maintainer field. - * Updating standards version to 4.0.0. - * Removing gbp.conf, not used anymore or should be specified in the - developers dotfiles. - * Correcting permissions in debian packaging files. - * Updating standards version to 4.0.1. - * Updating standards version to 4.1.0. - - [ Thomas Goirand ] + [ Corey Bryant ] * New upstream release. - * Updated to new upstream git repo. - * Fixed (build-)depends for this release. - * Using pkgos-dh_auto_{install,test}. - * Added PYTHONPATH=. when generatic sphinx doc. + * d/gbp.conf: Update debian-branch for Newton. + * d/control: Align (Build-)Depends with upstream. + * d/rules: Enable py3 tests. + * d/p/use-default-spinx-theme.patch: Added because openstack theme not found. - -- Thomas Goirand Tue, 03 Oct 2017 18:25:14 +0200 + -- Corey Bryant Thu, 01 Sep 2016 09:44:19 -0400 python-gnocchiclient (2.2.0-2) unstable; urgency=medium diff -pruN 7.0.7-1/debian/control 7.0.7-0ubuntu2/debian/control --- 7.0.7-1/debian/control 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/control 2021-06-23 08:04:27.000000000 +0000 @@ -1,40 +1,40 @@ Source: python-gnocchiclient Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper-compat (= 10), + debhelper-compat (= 12), dh-python, openstack-pkg-tools, + python3-sphinx, python3-all, - python3-pbr, + python3-pbr (>= 1.4), python3-setuptools, - python3-sphinx, Build-Depends-Indep: - python3-cliff, + python3-cliff (>= 2.10), python3-dateutil, python3-debtcollector, - python3-distutils, + python3-fixtures, python3-futurist, - python3-hacking, python3-iso8601, - python3-keystoneauth1, - python3-keystonemiddleware , + python3-keystoneauth1 (>= 2.0.0), + python3-keystonemiddleware, python3-monotonic, python3-openstackclient, - python3-osc-lib, - python3-pytest , - python3-pytest-xdist , + python3-osc-lib (>= 0.3.0), + python3-pytest, + python3-pytest-xdist, python3-six, - python3-sphinx-rtd-theme , - python3-testscenarios , - python3-ujson, -Standards-Version: 4.1.3 -Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-gnocchiclient -Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-gnocchiclient.git -Homepage: https://github.com/gnocchixyz/python-gnocchiclient + python3-testscenarios, + python3-testtools (>= 1.4.0), +Standards-Version: 4.5.0 +Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-gnocchiclient +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-gnocchiclient +Homepage: https://www.openstack.org/ +Testsuite: autopkgtest-pkg-python Package: python-gnocchiclient-doc Section: doc @@ -56,17 +56,16 @@ Description: bindings to the OpenStack G Package: python3-gnocchiclient Architecture: all Depends: - python3-cliff, + python3-cliff (>= 2.10), python3-dateutil, python3-debtcollector, - python3-distutils, python3-futurist, python3-iso8601, - python3-keystoneauth1, + python3-keystoneauth1 (>= 2.0.0), python3-monotonic, - python3-pbr, + python3-osc-lib (>= 0.3.0), + python3-pbr (>= 1.4), python3-six, - python3-ujson, ${misc:Depends}, ${python3:Depends}, Suggests: diff -pruN 7.0.7-1/debian/copyright 7.0.7-0ubuntu2/debian/copyright --- 7.0.7-1/debian/copyright 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/copyright 2021-06-23 08:04:27.000000000 +0000 @@ -1,6 +1,6 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gnocchiclient -Source: https://github.com/gnocchixyz/python-gnocchiclient +Source: http://www.openstack.org/ Files: * Copyright: (c) 2015-2016, OpenStack Foundation diff -pruN 7.0.7-1/debian/gbp.conf 7.0.7-0ubuntu2/debian/gbp.conf --- 7.0.7-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/gbp.conf 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 7.0.7-1/debian/patches/autogen-doc-disable.patch 7.0.7-0ubuntu2/debian/patches/autogen-doc-disable.patch --- 7.0.7-1/debian/patches/autogen-doc-disable.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/autogen-doc-disable.patch 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Dont use gendoc - it doesnt work properly. +Author: Chuck Short +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -26,7 +26,7 @@ + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. + extensions = [ +- 'gnocchiclient.gendoc', ++# 'gnocchiclient.gendoc', + 'sphinx.ext.autodoc', + ] + diff -pruN 7.0.7-1/debian/patches/do-not-use-numprocesses-pytest-option.patch 7.0.7-0ubuntu2/debian/patches/do-not-use-numprocesses-pytest-option.patch --- 7.0.7-1/debian/patches/do-not-use-numprocesses-pytest-option.patch 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/do-not-use-numprocesses-pytest-option.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Do not use --numprocesses=auto pytest option - This version doesn't work in Stretch. -Author: Thomas Goirand -Forwarded: not-needed -Last-Update: 2018-02-27 - -Index: python-gnocchiclient/tox.ini -=================================================================== ---- python-gnocchiclient.orig/tox.ini -+++ python-gnocchiclient/tox.ini -@@ -51,5 +51,5 @@ exclude=.git,.tox,dist,doc,*egg,build - application-import-names = gnocchiclient - - [pytest] --addopts = --verbose --numprocesses=auto -+addopts = --verbose - norecursedirs = .tox diff -pruN 7.0.7-1/debian/patches/drop-ujson.patch 7.0.7-0ubuntu2/debian/patches/drop-ujson.patch --- 7.0.7-1/debian/patches/drop-ujson.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/drop-ujson.patch 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1,250 @@ +Description: Drop ujson in favor of json as ujson is not in main. +Author: Corey Bryant +Forwarded: no +Last-Update: 2018-11-14 + +--- a/gnocchiclient/v1/archive_policy.py ++++ b/gnocchiclient/v1/archive_policy.py +@@ -11,7 +11,7 @@ + # License for the specific language governing permissions and limitations + # under the License. + +-import ujson ++import json + + from gnocchiclient.v1 import base + +@@ -41,7 +41,7 @@ + """ + return self._post( + self.url, headers={'Content-Type': "application/json"}, +- data=ujson.dumps(archive_policy)).json() ++ data=json.dumps(archive_policy)).json() + + def update(self, name, archive_policy): + """Update an archive policy. +@@ -55,7 +55,7 @@ + return self._patch( + self.url + '/' + name, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(archive_policy)).json() ++ data=json.dumps(archive_policy)).json() + + def delete(self, name): + """Delete an archive policy. +--- a/gnocchiclient/v1/archive_policy_rule.py ++++ b/gnocchiclient/v1/archive_policy_rule.py +@@ -11,7 +11,7 @@ + # License for the specific language governing permissions and limitations + # under the License. + +-import ujson ++import json + + from gnocchiclient.v1 import base + +@@ -36,7 +36,7 @@ + """Create an archive policy rule.""" + return self._post( + self.url, headers={'Content-Type': "application/json"}, +- data=ujson.dumps(archive_policy_rule)).json() ++ data=json.dumps(archive_policy_rule)).json() + + def update(self, name, new_name): + """Update an archive policy rule. +@@ -50,7 +50,7 @@ + return self._patch( + self.url + '/' + name, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps({'name': new_name})).json() ++ data=json.dumps({'name': new_name})).json() + + def delete(self, name): + """Delete an archive policy rule. +--- a/gnocchiclient/v1/metric.py ++++ b/gnocchiclient/v1/metric.py +@@ -18,7 +18,7 @@ + + import iso8601 + +-import ujson ++import json + + from gnocchiclient import utils + from gnocchiclient.v1 import base +@@ -107,7 +107,7 @@ + if resource_id is None: + return self._post( + self.metric_url, headers={'Content-Type': "application/json"}, +- data=ujson.dumps(metric)).json() ++ data=json.dumps(metric)).json() + + if name is None: + raise TypeError( +@@ -116,7 +116,7 @@ + return self._post( + self.resource_url % resource_id, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps({name: metric})).json()[0] ++ data=json.dumps({name: metric})).json()[0] + + # FIXME(jd): remove refetch_metric when LP#1497171 is fixed + @removals.removed_kwarg("refetch_metric") +@@ -153,7 +153,7 @@ + if resource_id is None: + metric = self._post( + self.metric_url, headers={'Content-Type': "application/json"}, +- data=ujson.dumps(metric)).json() ++ data=json.dumps(metric)).json() + # FIXME(sileht): create and get have a + # different output: LP#1497171 + if refetch_metric: +@@ -170,7 +170,7 @@ + metric = self._post( + self.resource_url % resource_id, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(metric)) ++ data=json.dumps(metric)) + return self.get(metric_name, resource_id) + + def delete(self, metric, resource_id=None): +@@ -207,7 +207,7 @@ + url = self.resource_url % resource_id + metric + "/measures" + return self._post( + url, headers={'Content-Type': "application/json"}, +- data=ujson.dumps(measures)) ++ data=json.dumps(measures)) + + def batch_metrics_measures(self, measures): + """Add measurements to metrics. +@@ -218,7 +218,7 @@ + return self._post( + self.metric_batch_url, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(measures)) ++ data=json.dumps(measures)) + + def batch_resources_metrics_measures(self, measures, create_metrics=False): + """Add measurements to named metrics if resources. +@@ -230,7 +230,7 @@ + return self._post( + self.resources_batch_url, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(measures), ++ data=json.dumps(measures), + params=dict(create_metrics=create_metrics)) + + def get_measures(self, metric, start=None, stop=None, aggregation=None, +@@ -337,7 +337,7 @@ + resource_type, metrics, + utils.dict_to_querystring(params)), + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(query)).json() ++ data=json.dumps(query)).json() + else: + params['filter'] = query + measures = self._post( +--- a/gnocchiclient/v1/resource.py ++++ b/gnocchiclient/v1/resource.py +@@ -11,7 +11,7 @@ + # License for the specific language governing permissions and limitations + # under the License. + +-import ujson ++import json + + from gnocchiclient import utils + from gnocchiclient.v1 import base +@@ -95,7 +95,7 @@ + return self._post( + self.url + resource_type, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(resource)).json() ++ data=json.dumps(resource)).json() + + def update(self, resource_type, resource_id, resource): + """Update a resource. +@@ -110,7 +110,7 @@ + return self._patch( + self.url + resource_type + "/" + resource_id, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(resource)).json() ++ data=json.dumps(resource)).json() + + def delete(self, resource_id): + """Delete a resource. +@@ -130,7 +130,7 @@ + return self._delete( + self.url + resource_type + "/", + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(query)).json() ++ data=json.dumps(query)).json() + return self._delete( + self.url + resource_type + "/?filter=" + query, + headers={'Content-Type': "application/json"}).json() +@@ -169,7 +169,7 @@ + return self._post( + url % utils.dict_to_querystring(params), + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(query)).json() ++ data=json.dumps(query)).json() + + params['filter'] = query + return self._post( +--- a/gnocchiclient/v1/resource_type.py ++++ b/gnocchiclient/v1/resource_type.py +@@ -11,7 +11,7 @@ + # License for the specific language governing permissions and limitations + # under the License. + +-import ujson ++import json + + from gnocchiclient.v1 import base + +@@ -32,7 +32,7 @@ + return self._post( + self.url, + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(resource_type)).json() ++ data=json.dumps(resource_type)).json() + + def get(self, name): + """Get a resource type. +@@ -62,4 +62,4 @@ + return self._patch( + self.url + name, + headers={'Content-Type': "application/json-patch+json"}, +- data=ujson.dumps(operations)).json() ++ data=json.dumps(operations)).json() +--- a/requirements.txt ++++ b/requirements.txt +@@ -4,7 +4,7 @@ + + pbr>=1.4 + cliff>=2.10 # Apache-2.0 +-ujson ++json + keystoneauth1>=2.0.0 + six + futurist +--- a/gnocchiclient/v1/aggregates.py ++++ b/gnocchiclient/v1/aggregates.py +@@ -15,7 +15,7 @@ + + import iso8601 + +-import ujson ++import json + + from gnocchiclient import utils + from gnocchiclient.v1 import base +@@ -69,7 +69,7 @@ + aggregates = self._post("v1/aggregates?%s" % ( + utils.dict_to_querystring(params)), + headers={'Content-Type': "application/json"}, +- data=ujson.dumps(data)).json() ++ data=json.dumps(data)).json() + + if search is not None and groupby is not None: + for group in aggregates: diff -pruN 7.0.7-1/debian/patches/py3-compat.patch 7.0.7-0ubuntu2/debian/patches/py3-compat.patch --- 7.0.7-1/debian/patches/py3-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/py3-compat.patch 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Minor Python 3 compat shim for doc generation +Author: James Page +Forwarded: no + +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -51,9 +51,9 @@ copyright = u'%s, The Gnocchi Developers + # built documents. + # + # The short X.Y version. +-version = subprocess.Popen(['sh', '-c', 'cd ../..; python setup.py --version'], ++version = subprocess.Popen(['sh', '-c', 'cd ../..; python3 setup.py --version'], + stdout=subprocess.PIPE).stdout.read() +-version = version.strip() ++version = version.decode('utf-8').strip() + # The full version, including alpha/beta/rc tags. + release = version + diff -pruN 7.0.7-1/debian/patches/series 7.0.7-0ubuntu2/debian/patches/series --- 7.0.7-1/debian/patches/series 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/series 2021-06-23 08:04:27.000000000 +0000 @@ -1 +1,4 @@ -do-not-use-numprocesses-pytest-option.patch +drop-ujson.patch +use-default-sphinx-theme.patch +autogen-doc-disable.patch +py3-compat.patch diff -pruN 7.0.7-1/debian/patches/use-default-sphinx-theme.patch 7.0.7-0ubuntu2/debian/patches/use-default-sphinx-theme.patch --- 7.0.7-1/debian/patches/use-default-sphinx-theme.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/patches/use-default-sphinx-theme.patch 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1,33 @@ +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -96,13 +96,17 @@ + + # The theme to use for HTML and HTML Help pages. See the documentation for + # a list of builtin themes. +-html_theme = 'sphinx_rtd_theme' ++# html_theme = 'sphinx_rtd_theme' ++html_theme = 'default' + + # Theme options are theme-specific and customize the look and feel of a theme + # further. For a list of options available for each theme, see the + # documentation. +-import sphinx_rtd_theme +-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] ++try: ++ import sphinx_rtd_theme ++ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] ++except ImportError: ++ pass + + + # The name for this set of Sphinx documents. If None, it defaults to +@@ -170,6 +174,6 @@ + # Output file base name for HTML help builder. + htmlhelp_basename = 'gnocchidoc' + +-html_theme_options = { +- 'logo_only': True, +-} ++# html_theme_options = { ++# 'logo_only': True, ++# } diff -pruN 7.0.7-1/debian/pydist-overrides 7.0.7-0ubuntu2/debian/pydist-overrides --- 7.0.7-1/debian/pydist-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/pydist-overrides 2021-06-23 08:04:27.000000000 +0000 @@ -0,0 +1 @@ +ujson diff -pruN 7.0.7-1/debian/python3-gnocchiclient.postrm 7.0.7-0ubuntu2/debian/python3-gnocchiclient.postrm --- 7.0.7-1/debian/python3-gnocchiclient.postrm 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/python3-gnocchiclient.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then - update-alternatives --remove gnocchi /usr/bin/python3-gnocchi -fi - -#DEBHELPER# - -exit 0 diff -pruN 7.0.7-1/debian/python3-gnocchiclient.prerm 7.0.7-0ubuntu2/debian/python3-gnocchiclient.prerm --- 7.0.7-1/debian/python3-gnocchiclient.prerm 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/python3-gnocchiclient.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove gnocchi /usr/bin/python3-gnocchi -fi - -#DEBHELPER# - -exit 0 diff -pruN 7.0.7-1/debian/rules 7.0.7-0ubuntu2/debian/rules --- 7.0.7-1/debian/rules 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/rules 2021-06-23 08:04:27.000000000 +0000 @@ -1,45 +1,29 @@ #!/usr/bin/make -f -UPSTREAM_GIT=https://github.com/gnocchixyz/python-gnocchiclient.git +export PYBUILD_NAME=gnocchiclient + include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc - -override_dh_auto_clean: - rm -rf build + dh $@ --buildsystem=pybuild --with python3,sphinxdoc -override_dh_auto_build: - echo "Do nothing..." +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 override_dh_auto_install: pkgos-dh_auto_install --no-py2 - # Generate bash completion - mkdir -p $(CURDIR)/debian/python3-gnocchiclient/usr/share/bash-completion/completions - PYTHONPATH=$(CURDIR)/debian/python3-gnocchiclient/usr/lib/python3/dist-packages \ - PATH=$(PATH):$(CURDIR)/debian/python3-gnocchiclient/usr/bin \ - gnocchi complete \ - >$(CURDIR)/debian/python3-gnocchiclient/usr/share/bash-completion/completions/gnocchi - sed -i 's#complete -F _python3_gnocchi python3-gnocchi#complete -F _python3_gnocchi gnocchi#' \ - $(CURDIR)/debian/python3-gnocchiclient/usr/share/bash-completion/completions/gnocchi - override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - set -e ; set -x ; for i in $(PYTHON3S) ; do \ - PYTHON=python$$i PYTHONPATH=. python$$i -m pytest gnocchiclient/tests/unit ; \ - done + pytest-3 gnocchiclient/tests/unit endif override_dh_sphinxdoc: -ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS))) - python3 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp - if ! export LANG=C.UTF-8 && export LC_ALL=C.UTF-8 && PATH=$$PATH:$(CURDIR)/debian/bin PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-gnocchiclient-doc/usr/share/doc/python-gnocchiclient-doc/html ; then \ - cat /tmp/sphinx-err* ; \ - exit 1 ; \ - fi - dh_sphinxdoc +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + sphinx-build -b html doc/source debian/python-gnocchiclient-doc/usr/share/doc/python-gnocchiclient-doc/html + dh_sphinxdoc -O--buildsystem=pybuild endif -override_dh_python3: - dh_python3 --shebang=/usr/bin/python3 +override_dh_clean: + dh_clean -O--buildsystem=python_distutils + rm -rf build diff -pruN 7.0.7-1/debian/salsa-ci.yml 7.0.7-0ubuntu2/debian/salsa-ci.yml --- 7.0.7-1/debian/salsa-ci.yml 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 7.0.7-1/debian/watch 7.0.7-0ubuntu2/debian/watch --- 7.0.7-1/debian/watch 2021-03-14 15:04:48.000000000 +0000 +++ 7.0.7-0ubuntu2/debian/watch 2021-06-23 08:04:27.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ -https://github.com/gnocchixyz/python-gnocchiclient/tags .*/(\d[brc\d\.]+)\.tar\.gz +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/gnocchiclient/gnocchiclient-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -pruN 7.0.7-1/.gitignore 7.0.7-0ubuntu2/.gitignore --- 7.0.7-1/.gitignore 2020-08-20 15:17:25.000000000 +0000 +++ 7.0.7-0ubuntu2/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -*.py[cod] - -# Packages -*.egg -*.egg-info -dist -build -parts - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -# Translations -*.mo - -# Sphinx -doc/build - -# pbr generates these -AUTHORS -ChangeLog - -# generated docs -doc/source/api -doc/source/gnocchi.rst - -# pytest cache -.cache diff -pruN 7.0.7-1/gnocchiclient.egg-info/dependency_links.txt 7.0.7-0ubuntu2/gnocchiclient.egg-info/dependency_links.txt --- 7.0.7-1/gnocchiclient.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/dependency_links.txt 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 7.0.7-1/gnocchiclient.egg-info/entry_points.txt 7.0.7-0ubuntu2/gnocchiclient.egg-info/entry_points.txt --- 7.0.7-1/gnocchiclient.egg-info/entry_points.txt 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/entry_points.txt 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,51 @@ +[console_scripts] +gnocchi = gnocchiclient.shell:main + +[keystoneauth1.plugin] +gnocchi-basic = gnocchiclient.auth:GnocchiBasicLoader +gnocchi-noauth = gnocchiclient.auth:GnocchiNoAuthLoader + +[openstack.cli.extension] +metric = gnocchiclient.osc + +[openstack.metric.v1] +metric_aggregates = gnocchiclient.v1.aggregates_cli:CliAggregates +metric_archive-policy-rule_create = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleCreate +metric_archive-policy-rule_delete = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleDelete +metric_archive-policy-rule_list = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleList +metric_archive-policy-rule_show = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleShow +metric_archive-policy_create = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyCreate +metric_archive-policy_delete = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyDelete +metric_archive-policy_list = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyList +metric_archive-policy_show = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyShow +metric_archive-policy_update = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyUpdate +metric_benchmark measures add = gnocchiclient.benchmark:CliBenchmarkMeasuresAdd +metric_benchmark measures show = gnocchiclient.benchmark:CliBenchmarkMeasuresShow +metric_benchmark metric create = gnocchiclient.benchmark:CliBenchmarkMetricCreate +metric_benchmark metric show = gnocchiclient.benchmark:CliBenchmarkMetricShow +metric_capabilities list = gnocchiclient.v1.capabilities_cli:CliCapabilitiesList +metric_create = gnocchiclient.v1.metric_cli:CliMetricCreate +metric_delete = gnocchiclient.v1.metric_cli:CliMetricDelete +metric_list = gnocchiclient.v1.metric_cli:CliMetricList +metric_measures aggregation = gnocchiclient.v1.metric_cli:CliMeasuresAggregation +metric_measures_add = gnocchiclient.v1.metric_cli:CliMeasuresAdd +metric_measures_batch-metrics = gnocchiclient.v1.metric_cli:CliMetricsMeasuresBatch +metric_measures_batch-resources-metrics = gnocchiclient.v1.metric_cli:CliResourcesMetricsMeasuresBatch +metric_measures_show = gnocchiclient.v1.metric_cli:CliMeasuresShow +metric_resource-type_create = gnocchiclient.v1.resource_type_cli:CliResourceTypeCreate +metric_resource-type_delete = gnocchiclient.v1.resource_type_cli:CliResourceTypeDelete +metric_resource-type_list = gnocchiclient.v1.resource_type_cli:CliResourceTypeList +metric_resource-type_show = gnocchiclient.v1.resource_type_cli:CliResourceTypeShow +metric_resource-type_update = gnocchiclient.v1.resource_type_cli:CliResourceTypeUpdate +metric_resource_batch_delete = gnocchiclient.v1.resource_cli:CliResourceBatchDelete +metric_resource_create = gnocchiclient.v1.resource_cli:CliResourceCreate +metric_resource_delete = gnocchiclient.v1.resource_cli:CliResourceDelete +metric_resource_history = gnocchiclient.v1.resource_cli:CliResourceHistory +metric_resource_list = gnocchiclient.v1.resource_cli:CliResourceList +metric_resource_search = gnocchiclient.v1.resource_cli:CliResourceSearch +metric_resource_show = gnocchiclient.v1.resource_cli:CliResourceShow +metric_resource_update = gnocchiclient.v1.resource_cli:CliResourceUpdate +metric_server_version = gnocchiclient.v1.build_cli:CliBuildShow +metric_show = gnocchiclient.v1.metric_cli:CliMetricShow +metric_status = gnocchiclient.v1.status_cli:CliStatusShow + diff -pruN 7.0.7-1/gnocchiclient.egg-info/not-zip-safe 7.0.7-0ubuntu2/gnocchiclient.egg-info/not-zip-safe --- 7.0.7-1/gnocchiclient.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/not-zip-safe 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 7.0.7-1/gnocchiclient.egg-info/pbr.json 7.0.7-0ubuntu2/gnocchiclient.egg-info/pbr.json --- 7.0.7-1/gnocchiclient.egg-info/pbr.json 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/pbr.json 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1 @@ +{"git_version": "cad2c27", "is_release": false} \ No newline at end of file diff -pruN 7.0.7-1/gnocchiclient.egg-info/PKG-INFO 7.0.7-0ubuntu2/gnocchiclient.egg-info/PKG-INFO --- 7.0.7-1/gnocchiclient.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/PKG-INFO 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,43 @@ +Metadata-Version: 2.1 +Name: gnocchiclient +Version: 7.0.7 +Summary: Python client library for Gnocchi +Home-page: http://gnocchi.xyz/gnocchiclient +Author: Gnocchi +License: UNKNOWN +Description: ============= + gnocchiclient + ============= + + .. image:: https://travis-ci.org/gnocchixyz/python-gnocchiclient.png?branch=master + :target: https://travis-ci.org/gnocchixyz/python-gnocchiclient + :alt: Build Status + + .. image:: https://badge.fury.io/py/gnocchiclient.svg + :target: https://badge.fury.io/py/gnocchiclient + + Python bindings to the Gnocchi API + + This is a client for Gnocchi API. There's a Python API (the ``gnocchiclient``` + module), and a ``command-line script`` (installed as ```gnocchi``). Each + implements the entire Gnocchi API. + + * Free software: Apache license + * Documentation: http://gnocchi.xyz/gnocchiclient + * Source: https://github.com/gnocchixyz/python-gnocchiclient + * Bugs: https://github.com/gnocchixyz/python-gnocchiclient/issues + + +Platform: UNKNOWN +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.7 +Provides-Extra: test +Provides-Extra: doc +Provides-Extra: openstack diff -pruN 7.0.7-1/gnocchiclient.egg-info/requires.txt 7.0.7-0ubuntu2/gnocchiclient.egg-info/requires.txt --- 7.0.7-1/gnocchiclient.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/requires.txt 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,22 @@ +pbr>=1.4 +cliff>=2.10 +ujson +keystoneauth1>=2.0.0 +six +futurist +iso8601 +monotonic +python-dateutil +debtcollector + +[doc] +sphinx!=1.2.0,!=1.3b1,>=1.1.2 +sphinx_rtd_theme + +[openstack] +osc-lib>=0.3.0 + +[test] +python-openstackclient +pytest +pytest-xdist diff -pruN 7.0.7-1/gnocchiclient.egg-info/SOURCES.txt 7.0.7-0ubuntu2/gnocchiclient.egg-info/SOURCES.txt --- 7.0.7-1/gnocchiclient.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/SOURCES.txt 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1,75 @@ +.coveragerc +.mailmap +.mergify.yml +.travis.yml +AUTHORS +ChangeLog +LICENSE +README.rst +requirements.txt +setup.cfg +setup.py +tox.ini +doc/source/api.rst +doc/source/conf.py +doc/source/index.rst +doc/source/installation.rst +doc/source/shell.rst +doc/source/_static/gnocchi-icon-source.png +doc/source/_static/gnocchi-icon.ico +doc/source/_static/gnocchi-logo.png +gnocchiclient/__init__.py +gnocchiclient/auth.py +gnocchiclient/benchmark.py +gnocchiclient/client.py +gnocchiclient/exceptions.py +gnocchiclient/gendoc.py +gnocchiclient/osc.py +gnocchiclient/shell.py +gnocchiclient/utils.py +gnocchiclient/version.py +gnocchiclient.egg-info/PKG-INFO +gnocchiclient.egg-info/SOURCES.txt +gnocchiclient.egg-info/dependency_links.txt +gnocchiclient.egg-info/entry_points.txt +gnocchiclient.egg-info/not-zip-safe +gnocchiclient.egg-info/pbr.json +gnocchiclient.egg-info/requires.txt +gnocchiclient.egg-info/top_level.txt +gnocchiclient/tests/__init__.py +gnocchiclient/tests/functional/__init__.py +gnocchiclient/tests/functional/base.py +gnocchiclient/tests/functional/test_aggregates.py +gnocchiclient/tests/functional/test_archive_policy.py +gnocchiclient/tests/functional/test_archive_policy_rule.py +gnocchiclient/tests/functional/test_benchmark.py +gnocchiclient/tests/functional/test_capabilities.py +gnocchiclient/tests/functional/test_metric.py +gnocchiclient/tests/functional/test_osc.py +gnocchiclient/tests/functional/test_others.py +gnocchiclient/tests/functional/test_resource.py +gnocchiclient/tests/functional/test_resource_type.py +gnocchiclient/tests/unit/__init__.py +gnocchiclient/tests/unit/test_auth.py +gnocchiclient/tests/unit/test_exceptions.py +gnocchiclient/v1/__init__.py +gnocchiclient/v1/aggregates.py +gnocchiclient/v1/aggregates_cli.py +gnocchiclient/v1/archive_policy.py +gnocchiclient/v1/archive_policy_cli.py +gnocchiclient/v1/archive_policy_rule.py +gnocchiclient/v1/archive_policy_rule_cli.py +gnocchiclient/v1/base.py +gnocchiclient/v1/build.py +gnocchiclient/v1/build_cli.py +gnocchiclient/v1/capabilities.py +gnocchiclient/v1/capabilities_cli.py +gnocchiclient/v1/client.py +gnocchiclient/v1/metric.py +gnocchiclient/v1/metric_cli.py +gnocchiclient/v1/resource.py +gnocchiclient/v1/resource_cli.py +gnocchiclient/v1/resource_type.py +gnocchiclient/v1/resource_type_cli.py +gnocchiclient/v1/status.py +gnocchiclient/v1/status_cli.py \ No newline at end of file diff -pruN 7.0.7-1/gnocchiclient.egg-info/top_level.txt 7.0.7-0ubuntu2/gnocchiclient.egg-info/top_level.txt --- 7.0.7-1/gnocchiclient.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/gnocchiclient.egg-info/top_level.txt 2020-08-21 13:17:05.000000000 +0000 @@ -0,0 +1 @@ +gnocchiclient diff -pruN 7.0.7-1/PKG-INFO 7.0.7-0ubuntu2/PKG-INFO --- 7.0.7-1/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.7-0ubuntu2/PKG-INFO 2020-08-21 13:17:06.000000000 +0000 @@ -0,0 +1,43 @@ +Metadata-Version: 2.1 +Name: gnocchiclient +Version: 7.0.7 +Summary: Python client library for Gnocchi +Home-page: http://gnocchi.xyz/gnocchiclient +Author: Gnocchi +License: UNKNOWN +Description: ============= + gnocchiclient + ============= + + .. image:: https://travis-ci.org/gnocchixyz/python-gnocchiclient.png?branch=master + :target: https://travis-ci.org/gnocchixyz/python-gnocchiclient + :alt: Build Status + + .. image:: https://badge.fury.io/py/gnocchiclient.svg + :target: https://badge.fury.io/py/gnocchiclient + + Python bindings to the Gnocchi API + + This is a client for Gnocchi API. There's a Python API (the ``gnocchiclient``` + module), and a ``command-line script`` (installed as ```gnocchi``). Each + implements the entire Gnocchi API. + + * Free software: Apache license + * Documentation: http://gnocchi.xyz/gnocchiclient + * Source: https://github.com/gnocchixyz/python-gnocchiclient + * Bugs: https://github.com/gnocchixyz/python-gnocchiclient/issues + + +Platform: UNKNOWN +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.7 +Provides-Extra: test +Provides-Extra: doc +Provides-Extra: openstack diff -pruN 7.0.7-1/setup.cfg 7.0.7-0ubuntu2/setup.cfg --- 7.0.7-1/setup.cfg 2020-08-20 15:17:25.000000000 +0000 +++ 7.0.7-0ubuntu2/setup.cfg 2020-08-21 13:17:06.000000000 +0000 @@ -1,90 +1,84 @@ [metadata] name = gnocchiclient summary = Python client library for Gnocchi -description-file = - README.rst +description-file = + README.rst author = Gnocchi home-page = http://gnocchi.xyz/gnocchiclient -classifier = - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 +classifier = + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.7 [files] -packages = - gnocchiclient +packages = + gnocchiclient [entry_points] -console_scripts = - gnocchi = gnocchiclient.shell:main - -keystoneauth1.plugin = - gnocchi-noauth = gnocchiclient.auth:GnocchiNoAuthLoader - gnocchi-basic = gnocchiclient.auth:GnocchiBasicLoader - -openstack.cli.extension = - metric = gnocchiclient.osc - -openstack.metric.v1 = - # FIXME(sileht): don't duplicate entry with the one in shell.py - metric_server_version = gnocchiclient.v1.build_cli:CliBuildShow - metric_status = gnocchiclient.v1.status_cli:CliStatusShow - metric_resource_list = gnocchiclient.v1.resource_cli:CliResourceList - metric_resource_show = gnocchiclient.v1.resource_cli:CliResourceShow - metric_resource_history = gnocchiclient.v1.resource_cli:CliResourceHistory - metric_resource_search = gnocchiclient.v1.resource_cli:CliResourceSearch - metric_resource_create = gnocchiclient.v1.resource_cli:CliResourceCreate - metric_resource_update = gnocchiclient.v1.resource_cli:CliResourceUpdate - metric_resource_delete = gnocchiclient.v1.resource_cli:CliResourceDelete - metric_resource_batch_delete = gnocchiclient.v1.resource_cli:CliResourceBatchDelete - metric_resource-type_list = gnocchiclient.v1.resource_type_cli:CliResourceTypeList - metric_resource-type_create = gnocchiclient.v1.resource_type_cli:CliResourceTypeCreate - metric_resource-type_show = gnocchiclient.v1.resource_type_cli:CliResourceTypeShow - metric_resource-type_update = gnocchiclient.v1.resource_type_cli:CliResourceTypeUpdate - metric_resource-type_delete = gnocchiclient.v1.resource_type_cli:CliResourceTypeDelete - metric_archive-policy_list = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyList - metric_archive-policy_show = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyShow - metric_archive-policy_create = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyCreate - metric_archive-policy_update = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyUpdate - metric_archive-policy_delete = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyDelete - metric_archive-policy-rule_list = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleList - metric_archive-policy-rule_show = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleShow - metric_archive-policy-rule_create = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleCreate - metric_archive-policy-rule_delete = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleDelete - metric_list = gnocchiclient.v1.metric_cli:CliMetricList - metric_show = gnocchiclient.v1.metric_cli:CliMetricShow - metric_create = gnocchiclient.v1.metric_cli:CliMetricCreate - metric_delete = gnocchiclient.v1.metric_cli:CliMetricDelete - metric_measures_show = gnocchiclient.v1.metric_cli:CliMeasuresShow - metric_measures_add = gnocchiclient.v1.metric_cli:CliMeasuresAdd - metric_measures_batch-metrics = gnocchiclient.v1.metric_cli:CliMetricsMeasuresBatch - metric_measures_batch-resources-metrics = gnocchiclient.v1.metric_cli:CliResourcesMetricsMeasuresBatch - metric_measures aggregation = gnocchiclient.v1.metric_cli:CliMeasuresAggregation - metric_aggregates = gnocchiclient.v1.aggregates_cli:CliAggregates - metric_capabilities list = gnocchiclient.v1.capabilities_cli:CliCapabilitiesList - metric_benchmark metric create = gnocchiclient.benchmark:CliBenchmarkMetricCreate - metric_benchmark metric show = gnocchiclient.benchmark:CliBenchmarkMetricShow - metric_benchmark measures add = gnocchiclient.benchmark:CliBenchmarkMeasuresAdd - metric_benchmark measures show = gnocchiclient.benchmark:CliBenchmarkMeasuresShow +console_scripts = + gnocchi = gnocchiclient.shell:main +keystoneauth1.plugin = + gnocchi-noauth = gnocchiclient.auth:GnocchiNoAuthLoader + gnocchi-basic = gnocchiclient.auth:GnocchiBasicLoader +openstack.cli.extension = + metric = gnocchiclient.osc +openstack.metric.v1 = + metric_server_version = gnocchiclient.v1.build_cli:CliBuildShow + metric_status = gnocchiclient.v1.status_cli:CliStatusShow + metric_resource_list = gnocchiclient.v1.resource_cli:CliResourceList + metric_resource_show = gnocchiclient.v1.resource_cli:CliResourceShow + metric_resource_history = gnocchiclient.v1.resource_cli:CliResourceHistory + metric_resource_search = gnocchiclient.v1.resource_cli:CliResourceSearch + metric_resource_create = gnocchiclient.v1.resource_cli:CliResourceCreate + metric_resource_update = gnocchiclient.v1.resource_cli:CliResourceUpdate + metric_resource_delete = gnocchiclient.v1.resource_cli:CliResourceDelete + metric_resource_batch_delete = gnocchiclient.v1.resource_cli:CliResourceBatchDelete + metric_resource-type_list = gnocchiclient.v1.resource_type_cli:CliResourceTypeList + metric_resource-type_create = gnocchiclient.v1.resource_type_cli:CliResourceTypeCreate + metric_resource-type_show = gnocchiclient.v1.resource_type_cli:CliResourceTypeShow + metric_resource-type_update = gnocchiclient.v1.resource_type_cli:CliResourceTypeUpdate + metric_resource-type_delete = gnocchiclient.v1.resource_type_cli:CliResourceTypeDelete + metric_archive-policy_list = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyList + metric_archive-policy_show = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyShow + metric_archive-policy_create = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyCreate + metric_archive-policy_update = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyUpdate + metric_archive-policy_delete = gnocchiclient.v1.archive_policy_cli:CliArchivePolicyDelete + metric_archive-policy-rule_list = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleList + metric_archive-policy-rule_show = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleShow + metric_archive-policy-rule_create = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleCreate + metric_archive-policy-rule_delete = gnocchiclient.v1.archive_policy_rule_cli:CliArchivePolicyRuleDelete + metric_list = gnocchiclient.v1.metric_cli:CliMetricList + metric_show = gnocchiclient.v1.metric_cli:CliMetricShow + metric_create = gnocchiclient.v1.metric_cli:CliMetricCreate + metric_delete = gnocchiclient.v1.metric_cli:CliMetricDelete + metric_measures_show = gnocchiclient.v1.metric_cli:CliMeasuresShow + metric_measures_add = gnocchiclient.v1.metric_cli:CliMeasuresAdd + metric_measures_batch-metrics = gnocchiclient.v1.metric_cli:CliMetricsMeasuresBatch + metric_measures_batch-resources-metrics = gnocchiclient.v1.metric_cli:CliResourcesMetricsMeasuresBatch + metric_measures aggregation = gnocchiclient.v1.metric_cli:CliMeasuresAggregation + metric_aggregates = gnocchiclient.v1.aggregates_cli:CliAggregates + metric_capabilities list = gnocchiclient.v1.capabilities_cli:CliCapabilitiesList + metric_benchmark metric create = gnocchiclient.benchmark:CliBenchmarkMetricCreate + metric_benchmark metric show = gnocchiclient.benchmark:CliBenchmarkMetricShow + metric_benchmark measures add = gnocchiclient.benchmark:CliBenchmarkMeasuresAdd + metric_benchmark measures show = gnocchiclient.benchmark:CliBenchmarkMeasuresShow [extras] -test = - python-openstackclient - pytest - pytest-xdist - -doc = - sphinx!=1.2.0,!=1.3b1,>=1.1.2 - sphinx_rtd_theme - -openstack = - osc-lib>=0.3.0 # Apache-2.0 +test = + python-openstackclient + pytest + pytest-xdist +doc = + sphinx!=1.2.0,!=1.3b1,>=1.1.2 + sphinx_rtd_theme +openstack = + osc-lib>=0.3.0 # Apache-2.0 [build_sphinx] source-dir = doc/source @@ -96,8 +90,13 @@ upload-dir = doc/build/html [pbr] autodoc_index_modules = true -autodoc_exclude_modules = - gnocchiclient.tests.* +autodoc_exclude_modules = + gnocchiclient.tests.* [wheel] universal = 1 + +[egg_info] +tag_build = +tag_date = 0 +