From 65586aa0d4374bd8a286d32b8cf50baa5539e338 Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Sun, 4 Jun 2017 10:21:30 +0700 Subject: [PATCH 01/80] Fix html_last_updated_fmt for Python3 html_last_updated_fmt option is interpreted as a byte string in python3, causing Sphinx build to break. This patch makes it utf-8 string. Changing Popen to .check_output because of 3 reasons: 1. check_output() will raise CalledProcessError if the called process returns a non-zero return code. 2. For consistency with keystone [1] and cinder [2] 3. It makes the code look much better. [1] https://review.openstack.org/#/c/457142/ [2] https://review.openstack.org/#/c/433081 Change-Id: I8d02c971d5b906ddbf58961c8544ecbcb9d01634 --- doc/source/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 20d22e9..9468074 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -176,8 +176,7 @@ html_static_path = ['_static'] git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"] try: - html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0].decode() + html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8') except Exception: warnings.warn('Cannot get last updated time from git repository. ' 'Not setting "html_last_updated_fmt".') -- GitLab From 6d416dd8be06587f9d8cf9f5455fd5616294f418 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 27 Jun 2017 12:13:01 +0000 Subject: [PATCH 02/80] Updated from global requirements Change-Id: I45062fa3b0742f0d90c3cf6016a86d1a435e4948 --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index bec732c..1ad4d50 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,9 +5,9 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0 # BSD -sphinx!=1.6.1,>=1.5.1 # BSD +sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -openstackdocstheme>=1.5.0 # Apache-2.0 +openstackdocstheme>=1.11.0 # Apache-2.0 -- GitLab From 125251576ff6c37d6eae35e0011bdb4ad58423cc Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 27 Jul 2017 19:12:29 +0000 Subject: [PATCH 03/80] Updated from global requirements Change-Id: Icfe0843c58233a9a49b27db0970008626162f8de --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 1ad4d50..8ba25c9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,4 +10,4 @@ oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -openstackdocstheme>=1.11.0 # Apache-2.0 +openstackdocstheme>=1.16.0 # Apache-2.0 -- GitLab From f17e86a44607357a8fb539ff766d3c026e6693c4 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 18 Aug 2017 04:43:32 +0000 Subject: [PATCH 04/80] Updated from global requirements Change-Id: I581285def64ebe1a5b3a87352982b8977fb2a86b --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 8ba25c9..2f2fedf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0 # BSD +mock>=2.0.0 # BSD sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -- GitLab From 55e415b9274042e931968ea7619253e19f9fabc4 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 13 Sep 2017 12:53:25 +0000 Subject: [PATCH 05/80] Updated from global requirements Change-Id: I5a6aab861a5896bbf4524bcd91810401c89f6ba4 --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2f2fedf..2cd6843 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,6 @@ mock>=2.0.0 # BSD sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -os-testr>=0.8.0 # Apache-2.0 +os-testr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -openstackdocstheme>=1.16.0 # Apache-2.0 +openstackdocstheme>=1.17.0 # Apache-2.0 -- GitLab From 8613e8660a8a5b3c58cf2078ab68f4c529effbcd Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 16 Oct 2017 15:07:32 +0200 Subject: [PATCH 06/80] Initial packaging. --- debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 66 +++++++++++++++++++++++++++++++++++++++++++ debian/copyright | 51 +++++++++++++++++++++++++++++++++ debian/rules | 29 +++++++++++++++++++ debian/source/format | 1 + debian/source/options | 1 + debian/watch | 4 +++ 8 files changed, 158 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/options create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..31a9035 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-monasca-statsd (1.7.0-1) unstable; urgency=medium + + * Initial release. (Closes: #878750) + + -- Thomas Goirand Mon, 16 Oct 2017 14:48:04 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..f9c03ca --- /dev/null +++ b/debian/control @@ -0,0 +1,66 @@ +Source: python-monasca-statsd +Section: python +Priority: optional +Maintainer: PKG OpenStack +Uploaders: + Thomas Goirand , +Build-Depends: + debhelper (>= 10), + dh-python, + openstack-pkg-tools, + python-all, + python-setuptools, + python3-all, + python3-setuptools, +Build-Depends-Indep: + python-coverage, + python-hacking, + python-mock, + python-os-testr (>= 0.8.0), + python-oslotest (>= 1.10.0), + python-six, + python3-mock, + python3-os-testr (>= 0.8.0), + python3-oslotest (>= 1.10.0), + python3-six, + testrepository, +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-monasca-statsd.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/python-monasca-statsd.git +Homepage: https://github.com/openstack/monasca-statsd + +Package: python-monasca-statsd +Architecture: all +Depends: + python-six, + ${misc:Depends}, + ${python:Depends}, +Description: monasca statsd API client - Python 2.7 + Monasca is a highly scalable, performant, fault-tolerant + monitoring-as-a-service solution that integrates with OpenStack. It uses a + REST API for high-speed metrics processing and querying and has a streaming + alarm engine and notification engine. + . + This Python module provides a client to connect to Monasca's statsd REST API. + With this client, you can handle counters, gauge, get histograms, timers and + more. + . + This package contains the Python 2.7 module. + +Package: python3-monasca-statsd +Architecture: all +Depends: + python3-six, + ${misc:Depends}, + ${python3:Depends}, +Description: monasca statsd client - Python 3.x + Monasca is a highly scalable, performant, fault-tolerant + monitoring-as-a-service solution that integrates with OpenStack. It uses a + REST API for high-speed metrics processing and querying and has a streaming + alarm engine and notification engine. + . + This Python module provides a client to connect to Monasca's statsd REST API. + With this client, you can handle counters, gauge, get histograms, timers and + more. + . + This package contains the Python 3.x module. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..daf0ebe --- /dev/null +++ b/debian/copyright @@ -0,0 +1,51 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: monasca-statsd +Source: https://github.com/openstack/monasca-statsd + +Files: * +Copyright: (c) 2013, OpenStack Foundation + (c) 2014-2016, Hewlett Packard Enterprise Development LP + (c) 2012, Datadog +License: Apache-2-and-BSD-3-clause + +Files: debian/* +Copyright: (c) 2017, Thomas Goirand +License: Apache-2-and-BSD-3-clause + +License: Apache-2-and-BSD-3-clause + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in /usr/share/common-licenses/Apache-2.0. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the Datadog nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL DATADOG BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d36cf77 --- /dev/null +++ b/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +UPSTREAM_GIT := https://github.com/openstack/monasca-statsd.git +include /usr/share/openstack-pkg-tools/pkgos.make + +%: + dh $@ --buildsystem=python_distutils --with python2,python3 + +override_dh_auto_install: + pkgos-dh_auto_install + +override_dh_auto_test: +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) + pkgos-dh_auto_test +endif + +override_dh_clean: + dh_clean -O--buildsystem=python_distutils + rm -rf build + +# Commands not to run +override_dh_installcatalogs: +override_dh_installemacsen override_dh_installifupdown: +override_dh_installinfo override_dh_installmenu override_dh_installmime: +override_dh_installmodules override_dh_installlogcheck: +override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: +override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: +override_dh_installcron override_dh_installdebconf: +override_dh_installlogrotate override_dh_installgsettings: diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..cb61fa5 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..3c53006 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/monasca-statsd/monasca-statsd-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) + -- GitLab From 22cbc7e215f8c97b3e79b2cd7b70766cbe2df601 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 16 Oct 2017 13:08:45 +0000 Subject: [PATCH 07/80] Fixed CVS URLs. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index f9c03ca..f3c1fa9 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Build-Depends-Indep: python3-six, testrepository, Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-monasca-statsd.git/ -Vcs-Git: https://anonscm.debian.org/git/openstack/python-monasca-statsd.git +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/libs/python-monasca-statsd.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd Package: python-monasca-statsd -- GitLab From fff5129aeb96c369399d90faf3cd9c480a255358 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 16 Oct 2017 13:10:16 +0000 Subject: [PATCH 08/80] Releasing to experimental. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 31a9035..3fe41e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-monasca-statsd (1.7.0-1) unstable; urgency=medium +python-monasca-statsd (1.7.0-1) experimental; urgency=medium * Initial release. (Closes: #878750) -- GitLab From 6503234fb88b85cdeee1a1ae1f560f1905d8f88b Mon Sep 17 00:00:00 2001 From: Adrian Czarnecki Date: Tue, 24 Oct 2017 09:01:00 +0200 Subject: [PATCH 09/80] Add .zuul.yaml file. Change-Id: I7e86b2200c539d0760320158addd1e767c7c6da8 Depends-On: I263b1a92a9ec7b5e38d9c1dc8b02e214102a92c2 --- .zuul.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .zuul.yaml diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..d790ad4 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,12 @@ +- project: + name: openstack/monasca-statsd + check: + jobs: + - monasca-tempest-python-mysql: + voting: false + - monasca-tempest-python-postgresql: + voting: false + - monasca-tempest-java-mysql: + voting: false + - monasca-tempest-java-postgresql: + voting: false \ No newline at end of file -- GitLab From ce71e054de4a0d31b926db34e0ff6a04a032e8db Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 16 Nov 2017 11:11:03 +0000 Subject: [PATCH 10/80] Updated from global requirements Change-Id: Iac433137f9177702870530e287d281e3366ee94b --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 08c2a88..3840e1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -six>=1.9.0 # MIT +six>=1.10.0 # MIT -- GitLab From 6ffc33b6e56882857d3fd0834450238bb3d81229 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 1 Dec 2017 15:18:25 +0100 Subject: [PATCH 11/80] Avoid tox_install.sh for constraints support We do not need tox_install.sh, pip can handle constraints itself and install the project correctly. Thus update tox.ini and remove the now obsolete tools/tox_install.sh file. This follows https://review.openstack.org/#/c/508061 to remove tools/tox_install.sh. Change-Id: Ie2985abfafa71177b5800a8ca5a97381662bfea9 --- tools/tox_install.sh | 57 -------------------------------------------- tox.ini | 16 ++++--------- 2 files changed, 5 insertions(+), 68 deletions(-) delete mode 100755 tools/tox_install.sh diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 1adc033..0000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# Constraint file contains this package version pin that is in conflict -# with installing the package from source. We should replace the version pin in -# the constraints file before applying it for from-source installation. - -ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner -BRANCH_NAME=master -PACKAGE_NAME=monasca-statsd -requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) - -set -e - -git config --global url.https://git.openstack.org/.insteadOf git://git.openstack.org/ - -CONSTRAINTS_FILE=$1 -shift - -install_cmd="pip install" -mydir=$(mktemp -dt "$PACKAGE_NAME-tox_install-XXXXXXX") -trap "rm -rf $mydir" EXIT -localfile=$mydir/upper-constraints.txt -if [[ $CONSTRAINTS_FILE != http* ]]; then - CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE -fi -curl $CONSTRAINTS_FILE -k -o $localfile -install_cmd="$install_cmd -c$localfile" - -if [ $requirements_installed -eq 0 ]; then - echo "ALREADY INSTALLED" > /tmp/tox_install.txt - echo "Requirements already installed; using existing package" -elif [ -x "$ZUUL_CLONER" ]; then - echo "ZUUL CLONER" > /tmp/tox_install.txt - pushd $mydir - $ZUUL_CLONER --cache-dir \ - /opt/git \ - --branch $BRANCH_NAME \ - git://git.openstack.org \ - openstack/requirements - cd openstack/requirements - $install_cmd -e . - popd -else - echo "PIP HARDCODE" > /tmp/tox_install.txt - if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then - REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements" - fi - $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} -fi - -# This is the main purpose of the script: Allow local installation of -# the current repo. It is listed in constraints file and thus any -# install will be constrained and we need to unconstrain it. -edit-constraints $localfile -- $PACKAGE_NAME "-e file://$PWD#egg=$PACKAGE_NAME" - -$install_cmd -U $* -exit $? diff --git a/tox.ini b/tox.ini index d9988d2..0ea8522 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,6 @@ minversion = 2.5 skipsdist = True [testenv] -setenv = - VIRTUAL_ENV={envdir} - OS_TEST_PATH=tests - CLIENT_NAME=monasca-statsd passenv = http_proxy HTTP_PROXY https_proxy @@ -15,9 +11,10 @@ passenv = http_proxy no_proxy NO_PROXY usedevelop = True -install_command = - {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +install_command = pip install -U {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = bash find @@ -27,21 +24,19 @@ commands = [testenv:py27] basepython = python2.7 -deps = {[testenv]deps} commands = {[testenv]commands} ostestr {posargs} [testenv:py35] basepython = python3.5 -deps = {[testenv]deps} commands = {[testenv]commands} ostestr {posargs} [testenv:cover] basepython = python2.7 -deps = {[testenv]deps} + commands = {[testenv]commands} coverage erase @@ -49,7 +44,6 @@ commands = coverage report [testenv:debug] -deps = {[testenv]deps} commands = {[testenv]commands} oslo_debug_helper -t {toxinidir}/tests {posargs} -- GitLab From 00b817158420f522a07019693d8b4583f1806180 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 2 Dec 2017 19:26:38 +0100 Subject: [PATCH 12/80] Remove -U from pip install 'pip install -U' ugrades specified packages, this is not necessary since we use constraints, remove the parameter '-U' from the line. With tools/tox_install.sh - which a previous change of mine removed - the -U was not harmful, but with the current set up, it might cause upgrades, so remove it. Change-Id: I9b14274aee2c19e8a12ee48a129b62f5f6c67c57 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0ea8522..012e06b 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ passenv = http_proxy no_proxy NO_PROXY usedevelop = True -install_command = pip install -U {opts} {packages} +install_command = pip install {opts} {packages} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/requirements.txt -- GitLab From 7a0add067005529afe1f5255ddd8e809f62a1c16 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 16 Jan 2018 04:13:29 +0000 Subject: [PATCH 13/80] Updated from global requirements Change-Id: Ide5c0f2ec8afe61978367b6458fb2c27b74a3b92 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2cd6843..d1fa86d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 +oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD openstackdocstheme>=1.17.0 # Apache-2.0 -- GitLab From 85a0e097d7f4b61949d36397961d5e067faa560f Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 16 Jan 2018 04:13:32 +0000 Subject: [PATCH 14/80] Updated from global requirements Change-Id: I3d8ec3d195941e71fbaf7481fff974032e833fd5 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2cd6843..d1fa86d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 +oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD openstackdocstheme>=1.17.0 # Apache-2.0 -- GitLab From e70fb43930bd55751dc24fd337c7b18988ac1922 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 18 Jan 2018 03:04:07 +0000 Subject: [PATCH 15/80] Updated from global requirements Change-Id: I5ebfaf4e03e5603e72603e704e40930a9005957d --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index d1fa86d..3cfc02e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -sphinx>=1.6.2 # BSD +sphinx!=1.6.6,>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 -- GitLab From 38a73dd358664fd726344d70de75141e38beed39 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 24 Jan 2018 01:03:22 +0000 Subject: [PATCH 16/80] Updated from global requirements Change-Id: I0ff9f66e2893ca534c90b7b0b7be6a37b665513d --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 3cfc02e..971c3bf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,4 +10,4 @@ oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -openstackdocstheme>=1.17.0 # Apache-2.0 +openstackdocstheme>=1.18.1 # Apache-2.0 -- GitLab From 8ed4fd0ad38cc479cf6e1813e5c91c6da8a793ba Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 24 Jan 2018 16:46:03 -0800 Subject: [PATCH 17/80] Zuul: Remove project name Zuul no longer requires the project-name for in-repo configuration. Omitting it makes forking or renaming projects easier. Change-Id: I89687aa13dc307431c28fa3c4fb190daf0a79fee --- .zuul.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d790ad4..28aff7f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: - name: openstack/monasca-statsd check: jobs: - monasca-tempest-python-mysql: @@ -9,4 +8,4 @@ - monasca-tempest-java-mysql: voting: false - monasca-tempest-java-postgresql: - voting: false \ No newline at end of file + voting: false -- GitLab From a5d2386730f8af6faae6e3f1179e900f208a1812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 12 Feb 2018 10:28:21 +0100 Subject: [PATCH 18/80] d/control: Set Vcs-* to salsa.debian.org --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3fe41e7..a3c9c5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-monasca-statsd (1.7.0-2) UNRELEASED; urgency=medium + + * d/control: Set Vcs-* to salsa.debian.org + + -- Ondřej Nový Mon, 12 Feb 2018 10:28:21 +0100 + python-monasca-statsd (1.7.0-1) experimental; urgency=medium * Initial release. (Closes: #878750) diff --git a/debian/control b/debian/control index f3c1fa9..a01667d 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Build-Depends-Indep: python3-six, testrepository, Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/libs/python-monasca-statsd.git/ -Vcs-Git: https://anonscm.debian.org/git/openstack/libs/python-monasca-statsd.git +Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd +Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd Package: python-monasca-statsd -- GitLab From 7e969926ec6c0e79b6a6cea47931f3f6ef089abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Tue, 13 Feb 2018 14:42:15 +0100 Subject: [PATCH 19/80] d/copyright: Use https in Format --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a3c9c5b..01eca1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-monasca-statsd (1.7.0-2) UNRELEASED; urgency=medium * d/control: Set Vcs-* to salsa.debian.org + * d/copyright: Use https in Format -- Ondřej Nový Mon, 12 Feb 2018 10:28:21 +0100 diff --git a/debian/copyright b/debian/copyright index daf0ebe..5ed0846 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: monasca-statsd Source: https://github.com/openstack/monasca-statsd -- GitLab From eb02c33c4fa754fffce2cc12582bfead81ad2a59 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 24 Jan 2018 16:46:03 -0800 Subject: [PATCH 20/80] Zuul: Remove project name Zuul no longer requires the project-name for in-repo configuration. Omitting it makes forking or renaming projects easier. Change-Id: Id4cbfc5e9abacf43831775c7538aa13e47ea3f8b --- .zuul.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d790ad4..28aff7f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: - name: openstack/monasca-statsd check: jobs: - monasca-tempest-python-mysql: @@ -9,4 +8,4 @@ - monasca-tempest-java-mysql: voting: false - monasca-tempest-java-postgresql: - voting: false \ No newline at end of file + voting: false -- GitLab From 7d6dea09f47ceb68ec7006003ee10c87c4daa47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Tue, 27 Feb 2018 16:40:40 +0100 Subject: [PATCH 21/80] d/control: Add trailing tilde to min version depend to allow backports --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 01eca1e..af1c02d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-monasca-statsd (1.7.0-2) UNRELEASED; urgency=medium * d/control: Set Vcs-* to salsa.debian.org * d/copyright: Use https in Format + * d/control: Add trailing tilde to min version depend to allow + backports -- Ondřej Nový Mon, 12 Feb 2018 10:28:21 +0100 diff --git a/debian/control b/debian/control index a01667d..ae303a7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper (>= 10), + debhelper (>= 10~), dh-python, openstack-pkg-tools, python-all, -- GitLab From b1442e9a0b3f987c9e6a86985e823a130b91c17e Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Thu, 8 Mar 2018 13:09:47 +0100 Subject: [PATCH 22/80] Remove PostgreSQL tempest jobs from Zuul * remove monasca-tempest-*-postgresql jobs * rename monasca-tempest-*-mysql -> monasca-tempest-*-influxdb jobs Story: 2001650 Task: 6670 Depends-On: https://review.openstack.org/550795 Change-Id: I8ec6bc2189f21af06ec43d739e024a23eb4c9f95 --- .zuul.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 28aff7f..b8e7c54 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,11 +1,7 @@ - project: check: jobs: - - monasca-tempest-python-mysql: + - monasca-tempest-python-influxdb: voting: false - - monasca-tempest-python-postgresql: - voting: false - - monasca-tempest-java-mysql: - voting: false - - monasca-tempest-java-postgresql: + - monasca-tempest-java-influxdb: voting: false -- GitLab From 851774fe3e6eaae475b5f65949c7db6009ea397f Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 10 Mar 2018 13:22:21 +0000 Subject: [PATCH 23/80] Updated from global requirements Change-Id: Ic358ce61819aca049343a8d1f22a155e3ac7c0d6 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 971c3bf..2ebbf53 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -sphinx!=1.6.6,>=1.6.2 # BSD +sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 -- GitLab From 411144878239b6347082dd5a67c0a5eb0654c96f Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 13 Mar 2018 07:01:31 +0000 Subject: [PATCH 24/80] Updated from global requirements Change-Id: I260d1aabf0cd76ea5f1dc6d08d115f123e3845f3 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2ebbf53..971c3bf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -sphinx!=1.6.6,<1.7.0,>=1.6.2 # BSD +sphinx!=1.6.6,>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 -- GitLab From b805480f92fad43449f69770e04ad71a2cc6fc18 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 15 Mar 2018 07:12:51 +0000 Subject: [PATCH 25/80] Updated from global requirements Change-Id: I7e9b4bcb8d65bec01a1d5828026f92fc47233019 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 971c3bf..7f7e5c0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -sphinx!=1.6.6,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0 -- GitLab From fafcdf65ec313c35c6f7d135684f93bdbf1be8d0 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 22 Mar 2018 15:49:50 -0400 Subject: [PATCH 26/80] add lower-constraints job Create a tox environment for running the unit tests against the lower bounds of the dependencies. Create a lower-constraints.txt to be used to enforce the lower bounds in those tests. Add openstack-tox-lower-constraints job to the zuul configuration. See http://lists.openstack.org/pipermail/openstack-dev/2018-March/128352.html for more details. Change-Id: I1c69e5d82410cd6245a7427a67ce741d82324d51 Depends-On: https://review.openstack.org/555034 Signed-off-by: Doug Hellmann --- .zuul.yaml | 4 ++++ lower-constraints.txt | 49 +++++++++++++++++++++++++++++++++++++++++++ tox.ini | 7 +++++++ 3 files changed, 60 insertions(+) create mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index b8e7c54..169bae0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,3 +5,7 @@ voting: false - monasca-tempest-java-influxdb: voting: false + - openstack-tox-lower-constraints + gate: + jobs: + - openstack-tox-lower-constraints diff --git a/lower-constraints.txt b/lower-constraints.txt new file mode 100644 index 0000000..a1c3ff9 --- /dev/null +++ b/lower-constraints.txt @@ -0,0 +1,49 @@ +alabaster==0.7.10 +appdirs==1.3.0 +Babel==2.3.4 +bandit==1.4.0 +coverage==4.0 +docutils==0.11 +dulwich==0.15.0 +extras==1.0.0 +fixtures==3.0.0 +flake8==2.5.5 +future==0.16.0 +gitdb==0.6.4 +GitPython==1.0.1 +hacking==0.12.0 +imagesize==0.7.1 +iso8601==0.1.11 +Jinja2==2.10 +keystoneauth1==3.4.0 +linecache2==1.0.0 +MarkupSafe==1.0 +mccabe==0.2.1 +mock==2.0.0 +mox3==0.20.0 +openstackdocstheme==1.18.1 +os-client-config==1.28.0 +os-testr==1.0.0 +oslosphinx==4.7.0 +oslotest==3.2.0 +pbr==2.0.0 +pep8==1.5.7 +pyflakes==0.8.1 +Pygments==2.2.0 +python-mimeparse==1.6.0 +python-subunit==1.0.0 +pytz==2013.6 +PyYAML==3.12 +requests==2.14.2 +requestsexceptions==1.2.0 +six==1.10.0 +smmap==0.9.0 +snowballstemmer==1.2.1 +Sphinx==1.6.5 +sphinxcontrib-websupport==1.0.1 +stestr==1.0.0 +stevedore==1.20.0 +testrepository==0.0.18 +testtools==2.2.0 +traceback2==1.4.0 +unittest2==1.1.0 diff --git a/tox.ini b/tox.ini index 012e06b..1c17d2a 100644 --- a/tox.ini +++ b/tox.ini @@ -71,3 +71,10 @@ commands = {posargs} show-source = True exclude=.venv,.git,.tox,dist,*egg,build,docs,cover max-line-length = 120 + +[testenv:lower-constraints] +basepython = python3 +deps = + -c{toxinidir}/lower-constraints.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt -- GitLab From fc269dc6f3a257e81b415e90709f228dac93f686 Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Tue, 27 Mar 2018 12:41:05 +0200 Subject: [PATCH 27/80] Clean up tox.ini * move common commands to [testenv] Change-Id: I46b155d3a19f0cdbf3a2694bbf2d1d7541737607 --- tox.ini | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tox.ini b/tox.ini index 1c17d2a..03bb746 100644 --- a/tox.ini +++ b/tox.ini @@ -21,31 +21,18 @@ whitelist_externals = bash rm commands = find . -type f -name "*.py[c|o]" -delete - -[testenv:py27] -basepython = python2.7 -commands = - {[testenv]commands} - ostestr {posargs} - -[testenv:py35] -basepython = python3.5 -commands = - {[testenv]commands} - ostestr {posargs} + ostestr {posargs} [testenv:cover] basepython = python2.7 commands = - {[testenv]commands} coverage erase python setup.py test --coverage --testr-args='{posargs}' --coverage-package-name=monascastatsd coverage report [testenv:debug] commands = - {[testenv]commands} oslo_debug_helper -t {toxinidir}/tests {posargs} [testenv:docs] -- GitLab From 39905082d0425684bea482ec8312e955773728a7 Mon Sep 17 00:00:00 2001 From: melissaml Date: Mon, 12 Mar 2018 17:57:55 +0800 Subject: [PATCH 28/80] Update links in README Change the outdated links to the latest links in README Change-Id: Ic829b89ae6737f2cf8aec0c3769c08d659640d89 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd2c355..e68c94e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Team and repository tags ======================== -[![Team and repository tags](https://governance.openstack.org/badges/monasca-statsd.svg)](https://governance.openstack.org/reference/tags/index.html) +[![Team and repository tags](https://governance.openstack.org/tc/badges/monasca-statsd.svg)](https://governance.openstack.org/tc/reference/tags/index.html) @@ -31,8 +31,8 @@ conn = mstatsd.Connection(host='localhost', port=8125) # Create the client with optional dimensions client = mstatsd.Client(connection=conn, dimensions={'env': 'test'}) -NOTE: You can also create a client without specifying the connection and it will create the client -with the default connection information for the monasca-agent statsd processor daemon +NOTE: You can also create a client without specifying the connection and it will create the client +with the default connection information for the monasca-agent statsd processor daemon which uses host='localhost' and port=8125. client = mstatsd.Client(dimensions={'env': 'test'}) -- GitLab From 9f64338f4ac3277d7016311fb86fb33f458fc268 Mon Sep 17 00:00:00 2001 From: Jui Chandwaskar Date: Wed, 11 Apr 2018 15:40:27 +0200 Subject: [PATCH 29/80] Update pep8 check Set max line length to 100 Change-Id: Ib724f9e9fe9d49d391e286a5499ccc89904fea4d Signed-off-by: Jui Chandwaskar --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 03bb746..0707c94 100644 --- a/tox.ini +++ b/tox.ini @@ -57,7 +57,7 @@ commands = {posargs} [flake8] show-source = True exclude=.venv,.git,.tox,dist,*egg,build,docs,cover -max-line-length = 120 +max-line-length = 100 [testenv:lower-constraints] basepython = python3 -- GitLab From 16465ea109dd0dd3347a72b14b4a739d48ea969b Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Tue, 8 May 2018 13:40:53 +0200 Subject: [PATCH 30/80] Remove repository section from README * Add reference to StoryBoard. Change-Id: I6f96fc0fb02b3719824d650787b70bb5cf620ab9 Story: 2001980 Task: 19599 --- README.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e68c94e..6ac1b70 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ Team and repository tags -A Monasca-Statsd Python client. +A Monasca-Statsd Python Client. ================ Quick Start Guide ----------------- -First install the library with `pip` or `easy_install` +First install the library with `pip` or `easy_install`: # Install in system python ... sudo pip install monasca-statsd @@ -75,21 +75,16 @@ with timer.time('t'): histogram = client.get_histogram('my_hist') histogram.send('query.time', 10, dimensions = {'version': '1.0', 'environment': 'dev'}) ``` -Repository -------------- - -The monasca-statsd code is located here: -[here](https://github.com/stackforge/monasca-statsd). Feedback -------- -To suggest a feature, report a bug, or general discussion, head over -[here](https://bugs.launchpad.net/monasca). +To suggest a feature, report a bug, or participate in the general discussion, +head over to [StoryBoard](https://storyboard.openstack.org/#!/project/872). License ------- -See LICENSE file +See LICENSE file. Code was originally forked from Datadog's dogstatsd-python, hence the dual license. -- GitLab From 3115cdca8f665e153bcc2ad751140a4d0f3c1bac Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 Jun 2018 15:27:00 -0400 Subject: [PATCH 31/80] fix tox python3 overrides We want to default to running all tox environments under python 3, so set the basepython value in each environment. We do not want to specify a minor version number, because we do not want to have to update the file every time we upgrade python. We do not want to set the override once in testenv, because that breaks the more specific versions used in default environments like py35 and py36. Change-Id: I946210d26cbdcb303b3eca623022608afc141fe3 Signed-off-by: Doug Hellmann --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tox.ini b/tox.ini index 0707c94..892336d 100644 --- a/tox.ini +++ b/tox.ini @@ -32,26 +32,32 @@ commands = coverage report [testenv:debug] +basepython = python3 commands = oslo_debug_helper -t {toxinidir}/tests {posargs} [testenv:docs] +basepython = python3 commands = rm -rf doc/build python setup.py build_sphinx [testenv:bandit] +basepython = python3 commands = bandit -r monascastatsd -s B311 -n5 -x monascastatsd/tests [testenv:flake8] +basepython = python3 commands = flake8 monascastatsd [testenv:pep8] +basepython = python3 commands = {[testenv:flake8]commands} {[testenv:bandit]commands} [testenv:venv] +basepython = python3 commands = {posargs} [flake8] -- GitLab From 785c29c22ff53592d5d22b660d697b013b3bc1c8 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Fri, 15 Jun 2018 17:38:47 -0400 Subject: [PATCH 32/80] Switch to using stestr According to Openstack summit session [1] stestr is maintained project to which all Openstack projects should migrate. Let's switch it then. [1] https://etherpad.openstack.org/p/YVR-python-pti Change-Id: Id31d458418d904b568be0adf98d5b579cfd841cd Signed-off-by: Charles Short --- .gitignore | 3 ++- .stestr.conf | 3 +++ test-requirements.txt | 4 ++-- tox.ini | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .stestr.conf diff --git a/.gitignore b/.gitignore index faa9c1d..2571e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ ChangeLog .coverage cover/ .testrepository/ -doc/build/ \ No newline at end of file +doc/build/ +.stestr diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..ea359ca --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./tests +top_dir=./ diff --git a/test-requirements.txt b/test-requirements.txt index 7f7e5c0..f197fb2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,9 +5,9 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 +stestr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 892336d..f989947 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ whitelist_externals = bash rm commands = find . -type f -name "*.py[c|o]" -delete - ostestr {posargs} + stestr run {posargs} [testenv:cover] basepython = python2.7 -- GitLab From 628efb6026285c5368e8cb486a6b10150b536983 Mon Sep 17 00:00:00 2001 From: Denis Poisson Date: Thu, 28 Jun 2018 11:02:27 +0200 Subject: [PATCH 33/80] Convert README.md to ReStructuredTest format Change-Id: I693ec76e2bd94573caa667cc49155de358a433f3 story: 2002163 task: 22597 --- README.md | 90 ---------------------------------------------------- README.rst | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.cfg | 2 +- 3 files changed, 94 insertions(+), 91 deletions(-) delete mode 100644 README.md create mode 100644 README.rst diff --git a/README.md b/README.md deleted file mode 100644 index 6ac1b70..0000000 --- a/README.md +++ /dev/null @@ -1,90 +0,0 @@ -Team and repository tags -======================== - -[![Team and repository tags](https://governance.openstack.org/tc/badges/monasca-statsd.svg)](https://governance.openstack.org/tc/reference/tags/index.html) - - - -A Monasca-Statsd Python Client. -================ - -Quick Start Guide ------------------ - -First install the library with `pip` or `easy_install`: - - # Install in system python ... - sudo pip install monasca-statsd - - # .. or into a virtual env - pip install monasca-statsd - -Then start instrumenting your code: - -``` -# Import the module. -import monascastatsd as mstatsd - -# Create the connection -conn = mstatsd.Connection(host='localhost', port=8125) - -# Create the client with optional dimensions -client = mstatsd.Client(connection=conn, dimensions={'env': 'test'}) - -NOTE: You can also create a client without specifying the connection and it will create the client -with the default connection information for the monasca-agent statsd processor daemon -which uses host='localhost' and port=8125. - -client = mstatsd.Client(dimensions={'env': 'test'}) - -# Increment and decrement a counter. -counter = client.get_counter(name='page.views') - -counter.increment() -counter += 3 - -counter.decrement() -counter -= 3 - -# Record a gauge 50% of the time. -gauge = client.get_gauge('gauge', dimensions={'env': 'test'}) - -gauge.send('metric', 123.4, sample_rate=0.5) - -# Sample a histogram. -histogram = client.get_histogram('histogram', dimensions={'test': 'True'}) - -histogram.send('metric', 123.4, dimensions={'color': 'red'}) - -# Time a function call. -timer = client.get_timer() - -@timer.timed('page.render') -def render_page(): - # Render things ... - pass - -# Time a block of code. -timer = client.get_timer() - -with timer.time('t'): - # Do stuff - time.sleep(2) - -# Add dimensions to any metric. -histogram = client.get_histogram('my_hist') -histogram.send('query.time', 10, dimensions = {'version': '1.0', 'environment': 'dev'}) -``` - -Feedback --------- - -To suggest a feature, report a bug, or participate in the general discussion, -head over to [StoryBoard](https://storyboard.openstack.org/#!/project/872). - - -License -------- - -See LICENSE file. -Code was originally forked from Datadog's dogstatsd-python, hence the dual license. diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..8946f2d --- /dev/null +++ b/README.rst @@ -0,0 +1,93 @@ +Team and repository tags +======================== + +.. image:: https://governance.openstack.org/tc/badges/monasca-statsd.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html + +A Monasca-Statsd Python Client. +=============================== + +Quick Start Guide +----------------- + +First install the library with ``pip`` or ``easy_install``: + +:: + + # Install in system python ... + sudo pip install monasca-statsd + + # .. or into a virtual env + pip install monasca-statsd + +Then start instrumenting your code: + +:: + + # Import the module. + import monascastatsd as mstatsd + + # Create the connection + conn = mstatsd.Connection(host='localhost', port=8125) + + # Create the client with optional dimensions + client = mstatsd.Client(connection=conn, dimensions={'env': 'test'}) + + NOTE: You can also create a client without specifying the connection and it will create the client + with the default connection information for the monasca-agent statsd processor daemon + which uses host='localhost' and port=8125. + + client = mstatsd.Client(dimensions={'env': 'test'}) + + # Increment and decrement a counter. + counter = client.get_counter(name='page.views') + + counter.increment() + counter += 3 + + counter.decrement() + counter -= 3 + + # Record a gauge 50% of the time. + gauge = client.get_gauge('gauge', dimensions={'env': 'test'}) + + gauge.send('metric', 123.4, sample_rate=0.5) + + # Sample a histogram. + histogram = client.get_histogram('histogram', dimensions={'test': 'True'}) + + histogram.send('metric', 123.4, dimensions={'color': 'red'}) + + # Time a function call. + timer = client.get_timer() + + @timer.timed('page.render') + def render_page(): + # Render things ... + pass + + # Time a block of code. + timer = client.get_timer() + + with timer.time('t'): + # Do stuff + time.sleep(2) + + # Add dimensions to any metric. + histogram = client.get_histogram('my_hist') + histogram.send('query.time', 10, dimensions = {'version': '1.0', 'environment': 'dev'}) + +Feedback +-------- + +To suggest a feature, report a bug, or participate in the general +discussion, head over to `StoryBoard`_. + +License +------- + +See LICENSE file. Code was originally forked from Datadog’s +dogstatsd-python, hence the dual license. + +.. _Team and repository tags: https://governance.openstack.org/tc/reference/tags/index.html +.. _StoryBoard: https://storyboard.openstack.org/#!/project/872 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 9adc837..297276e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ name = monasca-statsd maintainer = monasca maintainer_email = monasca@lists.launchpad.net -description-file = README.md +description-file = README.rst summary = Monasca statsd Python client home-page = https://github.com/openstack/monasca-statsd keywords= -- GitLab From 27e50fefddd631c275edc40a2067f8de2a55ae44 Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Thu, 19 Jul 2018 11:30:36 +0200 Subject: [PATCH 34/80] Add check for rst syntax * Remove duplicate target reference from README.rst Change-Id: I99145dcb09f8bd4340f932aeb8b560d2a728c9aa Story: 2002163 Task: 23058 --- README.rst | 3 +-- tox.ini | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 8946f2d..3a0b3ff 100644 --- a/README.rst +++ b/README.rst @@ -89,5 +89,4 @@ License See LICENSE file. Code was originally forked from Datadog’s dogstatsd-python, hence the dual license. -.. _Team and repository tags: https://governance.openstack.org/tc/reference/tags/index.html -.. _StoryBoard: https://storyboard.openstack.org/#!/project/872 \ No newline at end of file +.. _StoryBoard: https://storyboard.openstack.org/#!/project/872 diff --git a/tox.ini b/tox.ini index f989947..b6cc0cd 100644 --- a/tox.ini +++ b/tox.ini @@ -55,6 +55,7 @@ basepython = python3 commands = {[testenv:flake8]commands} {[testenv:bandit]commands} + python setup.py check --restructuredtext --strict [testenv:venv] basepython = python3 -- GitLab From 75295307c536f1f602df559aabee77108637e222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Fri, 3 Aug 2018 06:04:04 +0200 Subject: [PATCH 35/80] d/control: Use team+openstack@tracker.debian.org as maintainer --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index af1c02d..be09891 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-monasca-statsd (1.7.0-2) UNRELEASED; urgency=medium * d/copyright: Use https in Format * d/control: Add trailing tilde to min version depend to allow backports + * d/control: Use team+openstack@tracker.debian.org as maintainer -- Ondřej Nový Mon, 12 Feb 2018 10:28:21 +0100 diff --git a/debian/control b/debian/control index ae303a7..8c0b7ee 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-monasca-statsd Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: -- GitLab From b24c1f36e0cba8e5a46b865a67598fbe07647c66 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 22 Aug 2018 18:50:43 -0400 Subject: [PATCH 36/80] import zuul job settings from project-config This is a mechanically generated patch to complete step 1 of moving the zuul job settings out of project-config and into each project repository. Because there will be a separate patch on each branch, the branch specifiers for branch-specific jobs have been removed. Because this patch is generated by a script, there may be some cosmetic changes to the layout of the YAML file(s) as the contents are normalized. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I0c61ac9b8548e7dab1237a0a609c0243fdaca02c Story: #2002586 Task: #24312 --- .zuul.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 169bae0..3bd0974 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,8 @@ - project: + templates: + - openstack-python-jobs + - openstack-python35-jobs + - check-requirements check: jobs: - monasca-tempest-python-influxdb: @@ -6,6 +10,8 @@ - monasca-tempest-java-influxdb: voting: false - openstack-tox-lower-constraints + - openstack-tox-cover gate: jobs: - openstack-tox-lower-constraints + - openstack-tox-cover -- GitLab From f0b33ff83905b46d193f56c0b54f2e0eb0405804 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 22 Aug 2018 18:52:00 -0400 Subject: [PATCH 37/80] add python 3.6 unit test job This is a mechanically generated patch to add a unit test job running under Python 3.6 as part of the python3-first goal. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: Ia491e19cae441db2aeb312797c2e8dd7d8373b2a Story: #2002586 Task: #24312 --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index 3bd0974..39d72bb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,6 +2,7 @@ templates: - openstack-python-jobs - openstack-python35-jobs + - openstack-python36-jobs - check-requirements check: jobs: -- GitLab From b91b0c2f8fa0734b82317975dc98fd989df3f2b3 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 8 Sep 2018 16:19:15 +0200 Subject: [PATCH 38/80] Use templates for cover and lower-constraints Use openstack-tox-cover template, this runs the cover job in the check queue only. Use openstack-lower-constraints-jobs template. Remove jobs that are part of the templates. Change-Id: Ia957070619204997b5fa72db4b1a332c82f8355e --- .zuul.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 39d72bb..c694945 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,18 +1,14 @@ - project: templates: + - check-requirements + - openstack-cover-jobs + - openstack-lower-constraints-jobs - openstack-python-jobs - openstack-python35-jobs - openstack-python36-jobs - - check-requirements check: jobs: - monasca-tempest-python-influxdb: voting: false - monasca-tempest-java-influxdb: voting: false - - openstack-tox-lower-constraints - - openstack-tox-cover - gate: - jobs: - - openstack-tox-lower-constraints - - openstack-tox-cover -- GitLab From c97ccb2f99d1faa9c1b35598f3dea2d97a3963a5 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 26 Sep 2018 18:56:53 -0400 Subject: [PATCH 39/80] fix tox python3 overrides We want to default to running all tox environments under python 3, so set the basepython value in each environment. We do not want to specify a minor version number, because we do not want to have to update the file every time we upgrade python. We do not want to set the override once in testenv, because that breaks the more specific versions used in default environments like py35 and py36. Change-Id: Ie12f0b23e32b64b57fec5f2926fa3504b16ad2df Signed-off-by: Doug Hellmann --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b6cc0cd..e26580b 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ commands = stestr run {posargs} [testenv:cover] -basepython = python2.7 +basepython = python3 commands = coverage erase -- GitLab From 264cb6356d607ec99fc5e0ba83beba49efbae464 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Tue, 30 Oct 2018 10:35:03 -0500 Subject: [PATCH 40/80] Remove setup.py check from pep8 job Using "python setup.py check -r -s" method of checking the package has been deprecated with the new recommendation to build the sdist and wheel, then running "twine check" against the output. Luckily, there is already a job that covers this that only runs when the README, setup.py, or setup.cfg files change, making running this in the pep8 job redundant. This covered by the test-release-openstack-python3 that is defined in the publish-to-pypi-python3 template. More details can be found in this mailing list post: http://lists.openstack.org/pipermail/openstack-dev/2018-October/136136.html Change-Id: I901a85a2663323b5ee2e412405a3aabc02fdf032 Signed-off-by: Sean McGinnis --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index e26580b..64cfcc5 100644 --- a/tox.ini +++ b/tox.ini @@ -55,7 +55,6 @@ basepython = python3 commands = {[testenv:flake8]commands} {[testenv:bandit]commands} - python setup.py check --restructuredtext --strict [testenv:venv] basepython = python3 -- GitLab From 7640b38bf1f7817215cb8d8b48a90b24251a8d96 Mon Sep 17 00:00:00 2001 From: melissaml Date: Sun, 6 Jan 2019 17:52:57 +0800 Subject: [PATCH 41/80] Update hacking version to latest Change-Id: I0bd2adacd080dfc2c55cf8681fef831cbcb673c3 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index f197fb2..67fa8e7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -- GitLab From 651fe251bb3855a17b17115b833b7e43f4f2cec6 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Thu, 31 Jan 2019 21:32:39 +0100 Subject: [PATCH 42/80] Add tempest tests jobs Change-Id: I1e06a5f2dd06ca7d53aa83119d14bc569a35e27c --- .zuul.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index c694945..867ef85 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -8,7 +8,9 @@ - openstack-python36-jobs check: jobs: - - monasca-tempest-python-influxdb: + - monasca-tempest-python2-influxdb: + voting: false + - monasca-tempest-python3-influxdb: voting: false - monasca-tempest-java-influxdb: voting: false -- GitLab From df450e4d5d0e99e4cabaa90419bfc3e0c9375fde Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 15 Feb 2019 00:07:03 -0500 Subject: [PATCH 43/80] add python 3.7 unit test job This is a mechanically generated patch to add a unit test job running under Python 3.7. See ML discussion here [1] for context. [1] http://lists.openstack.org/pipermail/openstack-dev/2018-October/135626.html Change-Id: I5cb04c5f575c771e46ed1eb1bb390e66524a0d91 Story: #2004073 Task: #27430 --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index 867ef85..a5af8db 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,6 +6,7 @@ - openstack-python-jobs - openstack-python35-jobs - openstack-python36-jobs + - openstack-python37-jobs check: jobs: - monasca-tempest-python2-influxdb: -- GitLab From c9356f52e17547591cf16f5de0c0af34b314d989 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 18 Feb 2019 15:28:37 +0800 Subject: [PATCH 44/80] add python 3.7 unit test job This is a mechanically generated patch to add a unit test job running under Python 3.7. See ML discussion here [1] for context. [1] http://lists.openstack.org/pipermail/openstack-dev/2018-October/135626.html Change-Id: I9e6fa6420dc3d00bb122aa0d4e2ac5c1d5d178bc --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index 867ef85..a5af8db 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,6 +6,7 @@ - openstack-python-jobs - openstack-python35-jobs - openstack-python36-jobs + - openstack-python37-jobs check: jobs: - monasca-tempest-python2-influxdb: -- GitLab From f15d4876dedd5fbcc488359c1b7f25a17faf5d65 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 27 Mar 2019 09:57:58 +0100 Subject: [PATCH 45/80] Now packaging 1.11.0 --- debian/changelog | 10 ++++++---- debian/control | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index be09891..90391e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -python-monasca-statsd (1.7.0-2) UNRELEASED; urgency=medium +python-monasca-statsd (1.11.0-1) experimental; urgency=medium + [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org * d/copyright: Use https in Format - * d/control: Add trailing tilde to min version depend to allow - backports * d/control: Use team+openstack@tracker.debian.org as maintainer - -- Ondřej Nový Mon, 12 Feb 2018 10:28:21 +0100 + [ Thomas Goirand ] + * New upstream release. + + -- Thomas Goirand Wed, 27 Mar 2019 09:57:23 +0100 python-monasca-statsd (1.7.0-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 8c0b7ee..c785da4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper (>= 10~), + debhelper (>= 10), dh-python, openstack-pkg-tools, python-all, -- GitLab From 2f1cd3ed8b90eb1c8ff1ec9ad1a22989effd52e6 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 27 Mar 2019 09:59:53 +0100 Subject: [PATCH 46/80] Removed Python 2 support. --- debian/changelog | 1 + debian/control | 35 +++++------------------------------ debian/rules | 26 +++++++++----------------- 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90391e0..82ad02e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ python-monasca-statsd (1.11.0-1) experimental; urgency=medium [ Thomas Goirand ] * New upstream release. + * Removed Python 2 support. -- Thomas Goirand Wed, 27 Mar 2019 09:57:23 +0100 diff --git a/debian/control b/debian/control index c785da4..3c6af6c 100644 --- a/debian/control +++ b/debian/control @@ -8,45 +8,20 @@ Build-Depends: debhelper (>= 10), dh-python, openstack-pkg-tools, - python-all, - python-setuptools, python3-all, python3-setuptools, Build-Depends-Indep: - python-coverage, - python-hacking, - python-mock, - python-os-testr (>= 0.8.0), - python-oslotest (>= 1.10.0), - python-six, + python3-coverage, + python3-hacking, python3-mock, - python3-os-testr (>= 0.8.0), - python3-oslotest (>= 1.10.0), + python3-oslotest, python3-six, - testrepository, -Standards-Version: 4.1.1 + python3-stestr, +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd -Package: python-monasca-statsd -Architecture: all -Depends: - python-six, - ${misc:Depends}, - ${python:Depends}, -Description: monasca statsd API client - Python 2.7 - Monasca is a highly scalable, performant, fault-tolerant - monitoring-as-a-service solution that integrates with OpenStack. It uses a - REST API for high-speed metrics processing and querying and has a streaming - alarm engine and notification engine. - . - This Python module provides a client to connect to Monasca's statsd REST API. - With this client, you can handle counters, gauge, get histograms, timers and - more. - . - This package contains the Python 2.7 module. - Package: python3-monasca-statsd Architecture: all Depends: diff --git a/debian/rules b/debian/rules index d36cf77..9a854f1 100755 --- a/debian/rules +++ b/debian/rules @@ -4,26 +4,18 @@ UPSTREAM_GIT := https://github.com/openstack/monasca-statsd.git include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python2,python3 + dh $@ --buildsystem=python_distutils --with python3 + +override_dh_auto_clean: + rm -rf build + +override_dh_auto_build: + echo "Do nothing..." override_dh_auto_install: - pkgos-dh_auto_install + pkgos-dh_auto_install --no-py2 override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - pkgos-dh_auto_test + pkgos-dh_auto_test --no-py2 endif - -override_dh_clean: - dh_clean -O--buildsystem=python_distutils - rm -rf build - -# Commands not to run -override_dh_installcatalogs: -override_dh_installemacsen override_dh_installifupdown: -override_dh_installinfo override_dh_installmenu override_dh_installmime: -override_dh_installmodules override_dh_installlogcheck: -override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: -override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: -override_dh_installcron override_dh_installdebconf: -override_dh_installlogrotate override_dh_installgsettings: -- GitLab From 18a738ab4e20748a53dc7408c11b5caa4c99068f Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Mon, 15 Apr 2019 00:01:58 +0000 Subject: [PATCH 47/80] Dropping the py35 testing All the integration testing has been moved to Bionic now[1] and py3.5 is not tested runtime for Train or stable/stein[2]. As per below ML thread, we are good to drop the py35 testing now: http://lists.openstack.org/pipermail/openstack-discuss/2019-April/005097.html [1] http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004647.html [2] https://governance.openstack.org/tc/reference/runtimes/stein.html https://governance.openstack.org/tc/reference/runtimes/train.html Change-Id: I69a229d92a7ec2b71c5ade0771f5bd66ac3fd448 --- .zuul.yaml | 1 - setup.cfg | 2 +- tox.ini | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a5af8db..297ca32 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,7 +4,6 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs - openstack-python37-jobs check: diff --git a/setup.cfg b/setup.cfg index 297276e..1c975bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ classifier = Topic :: System :: Monitoring Programming Language :: Python Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 [files] packages = diff --git a/tox.ini b/tox.ini index 64cfcc5..92913b9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35},pep8,cover +envlist = py{27,36},pep8,cover minversion = 2.5 skipsdist = True -- GitLab From a89eef1044fba93ef9dc7b08e5f782335fecef7e Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:35:46 +0000 Subject: [PATCH 48/80] OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have. --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 8ae1bca..1612ebe 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/monasca-statsd.git -- GitLab From 2b4a35dbbf3cb1297c80fcf734b9737d91ec6da8 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Tue, 23 Apr 2019 16:41:16 +0800 Subject: [PATCH 49/80] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I25f3211e2524a5ebb69a4bef0d7566f0745307db --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 92913b9..3d37c24 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ passenv = http_proxy usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = bash -- GitLab From b9bdf0c7926f268a6c8134b351f0880edf05a4f0 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 5 Jul 2019 11:42:24 -0400 Subject: [PATCH 50/80] Add Python 3 Train unit tests This is a mechanically generated patch to ensure unit testing is in place for all of the Tested Runtimes for Train. See the Train python3-updates goal document for details: https://governance.openstack.org/tc/goals/train/python3-updates.html Change-Id: Ic95726f90b549df62d6a3e5312e1fa1dc7e50e48 Story: #2005924 Task: #34223 --- .zuul.yaml | 3 +-- setup.cfg | 2 ++ tox.ini | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 297ca32..7cecbb2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,8 +4,7 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-train-jobs check: jobs: - monasca-tempest-python2-influxdb: diff --git a/setup.cfg b/setup.cfg index 1c975bb..1c1eb6d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,9 @@ classifier = Topic :: System :: Monitoring Programming Language :: Python Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = diff --git a/tox.ini b/tox.ini index 3d37c24..bee413c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,36},pep8,cover +envlist = py27,py37,pep8,cover minversion = 2.5 skipsdist = True -- GitLab From 6a8ce64b366fa198303fa1cac2292472e64b56dc Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Wed, 10 Jul 2019 18:26:13 +0200 Subject: [PATCH 51/80] Disable monasca-tempest-java-influxdb job The job has been failing for a long time. Java implementation of InfluxDB persister is not maintained. Change-Id: I4f2855d6090b91f413f5bfc20b6183ef4ded7e42 --- .zuul.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7cecbb2..ab7198c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,5 +11,3 @@ voting: false - monasca-tempest-python3-influxdb: voting: false - - monasca-tempest-java-influxdb: - voting: false -- GitLab From 0d5def13e538dad54c4cf6237365a75d65f05da2 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 16 Jul 2019 21:38:42 +0200 Subject: [PATCH 52/80] Uploading to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 82ad02e..1d70ae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-monasca-statsd (1.11.0-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Tue, 16 Jul 2019 21:38:30 +0200 + python-monasca-statsd (1.11.0-1) experimental; urgency=medium [ Ondřej Nový ] -- GitLab From 2eb678f75d4fba41be53273cab99a35b6e50d0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 18 Jul 2019 16:39:53 +0200 Subject: [PATCH 53/80] Use debhelper-compat instead of debian/compat --- debian/changelog | 6 ++++++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 1d70ae6..8718417 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-monasca-statsd (1.11.0-3) UNRELEASED; urgency=medium + + * Use debhelper-compat instead of debian/compat. + + -- Ondřej Nový Thu, 18 Jul 2019 16:39:53 +0200 + python-monasca-statsd (1.11.0-2) unstable; urgency=medium * Uploading to unstable. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 3c6af6c..b6c167a 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Build-Depends: - debhelper (>= 10), + debhelper-compat (= 10), dh-python, openstack-pkg-tools, python3-all, -- GitLab From 0b9526d79c29ceac1d710c9418c0d5d4a9eacf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Fri, 19 Jul 2019 15:57:37 +0200 Subject: [PATCH 54/80] Bump Standards-Version to 4.4.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8718417..300914c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-monasca-statsd (1.11.0-3) UNRELEASED; urgency=medium * Use debhelper-compat instead of debian/compat. + * Bump Standards-Version to 4.4.0. -- Ondřej Nový Thu, 18 Jul 2019 16:39:53 +0200 diff --git a/debian/control b/debian/control index b6c167a..52c8144 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends-Indep: python3-oslotest, python3-six, python3-stestr, -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd -- GitLab From 5d2426f88e06db7e80526b32b6955edc256a629b Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Thu, 26 Sep 2019 14:03:39 +0800 Subject: [PATCH 55/80] Update the constraints url For more detail, see http://lists.openstack.org/pipermail/openstack-discuss/2019-May/006478.html Change-Id: Ie5c67b05bb90da2a4e3c3d115799ee780edf5e69 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index bee413c..74be9e8 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ passenv = http_proxy usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = bash -- GitLab From 71b136e9c5f4dce6406cb6efd8570e71aa1a2226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Fri, 18 Oct 2019 16:28:51 +0200 Subject: [PATCH 56/80] Bump Standards-Version to 4.4.1 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 300914c..e45f9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ python-monasca-statsd (1.11.0-3) UNRELEASED; urgency=medium * Use debhelper-compat instead of debian/compat. - * Bump Standards-Version to 4.4.0. + * Bump Standards-Version to 4.4.1. -- Ondřej Nový Thu, 18 Jul 2019 16:39:53 +0200 diff --git a/debian/control b/debian/control index 52c8144..1e15b9a 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends-Indep: python3-oslotest, python3-six, python3-stestr, -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd -- GitLab From 680d9118686d5234f8b9196f81cff40b7a168f9b Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Wed, 23 Oct 2019 16:10:11 +0800 Subject: [PATCH 57/80] Switch to Ussuri jobs Change-Id: I240f95772c990dc1ee84ba5ece50573dd2079240 --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index ab7198c..bdc98e7 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,7 +4,7 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs check: jobs: - monasca-tempest-python2-influxdb: -- GitLab From 20463329439293958e87d8deebeb9f51ac7dfd5a Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 15 Nov 2019 16:30:38 +0000 Subject: [PATCH 58/80] [ussuri][goal] Drop python 2.7 support and testing OpenStack is dropping the py2.7 support in ussuri cycle. monasca-statsd is ready with python 3 and ok to drop the python 2.7 support. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Change-Id: I522d737c5202a7c7ac292547679b71fcddad3091 --- .zuul.yaml | 3 --- releasenotes/notes/drop-py-2-7-c9e3758f73d5cf29.yaml | 6 ++++++ setup.cfg | 1 - tox.ini | 11 ++--------- 4 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/drop-py-2-7-c9e3758f73d5cf29.yaml diff --git a/.zuul.yaml b/.zuul.yaml index bdc98e7..d182c4f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,11 +3,8 @@ - check-requirements - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs check: jobs: - - monasca-tempest-python2-influxdb: - voting: false - monasca-tempest-python3-influxdb: voting: false diff --git a/releasenotes/notes/drop-py-2-7-c9e3758f73d5cf29.yaml b/releasenotes/notes/drop-py-2-7-c9e3758f73d5cf29.yaml new file mode 100644 index 0000000..d035349 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-c9e3758f73d5cf29.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of monasca-statsd + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by monasca-statsd is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 1c1eb6d..d0e6715 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,6 @@ classifier = License :: OSI Approved :: Apache Software License Topic :: System :: Monitoring Programming Language :: Python - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index 74be9e8..e9bfa8f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] -envlist = py27,py37,pep8,cover +envlist = py37,pep8,cover minversion = 2.5 skipsdist = True [testenv] +basepython = python3 passenv = http_proxy HTTP_PROXY https_proxy @@ -24,7 +25,6 @@ commands = stestr run {posargs} [testenv:cover] -basepython = python3 commands = coverage erase @@ -32,32 +32,26 @@ commands = coverage report [testenv:debug] -basepython = python3 commands = oslo_debug_helper -t {toxinidir}/tests {posargs} [testenv:docs] -basepython = python3 commands = rm -rf doc/build python setup.py build_sphinx [testenv:bandit] -basepython = python3 commands = bandit -r monascastatsd -s B311 -n5 -x monascastatsd/tests [testenv:flake8] -basepython = python3 commands = flake8 monascastatsd [testenv:pep8] -basepython = python3 commands = {[testenv:flake8]commands} {[testenv:bandit]commands} [testenv:venv] -basepython = python3 commands = {posargs} [flake8] @@ -66,7 +60,6 @@ exclude=.venv,.git,.tox,dist,*egg,build,docs,cover max-line-length = 100 [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -- GitLab From 55ebdd45b4d6a65c9d5f22f3af961c3e9541e98a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 31 Mar 2020 21:46:20 +0200 Subject: [PATCH 59/80] Update hacking for Python3 The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found by updated hacking version. Remove hacking and friends from lower-constraints, they are not needed there. Change-Id: I013b73347ed56c8c64a8aff73ec60ea738bc0c76 --- doc/source/conf.py | 4 ++-- lower-constraints.txt | 4 ---- test-requirements.txt | 2 +- tests/test_monascastatsd.py | 4 +++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 9468074..3e2e53a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -172,9 +172,9 @@ html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", - "-n1"] + "-n1"] try: html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8') except Exception: diff --git a/lower-constraints.txt b/lower-constraints.txt index a1c3ff9..d185a87 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -7,11 +7,9 @@ docutils==0.11 dulwich==0.15.0 extras==1.0.0 fixtures==3.0.0 -flake8==2.5.5 future==0.16.0 gitdb==0.6.4 GitPython==1.0.1 -hacking==0.12.0 imagesize==0.7.1 iso8601==0.1.11 Jinja2==2.10 @@ -27,8 +25,6 @@ os-testr==1.0.0 oslosphinx==4.7.0 oslotest==3.2.0 pbr==2.0.0 -pep8==1.5.7 -pyflakes==0.8.1 Pygments==2.2.0 python-mimeparse==1.6.0 python-subunit==1.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index 67fa8e7..25e59f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.1.0,<1.2.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD diff --git a/tests/test_monascastatsd.py b/tests/test_monascastatsd.py index cf9ea3a..e8989be 100644 --- a/tests/test_monascastatsd.py +++ b/tests/test_monascastatsd.py @@ -274,7 +274,8 @@ class TestMonascaStatsd(unittest.TestCase): timer.timing('timer', 123) self.client.connection.close_buffer() - self.assertEqual(six.b("site.views:123|g|#{'env': 'test'}\nsite.timer:123|g|#{'env': 'test'}"), + self.assertEqual(six.b("site.views:123|g|#{'env': 'test'}\n" + "site.timer:123|g|#{'env': 'test'}"), self.recv(gauge)) def test_context_manager(self): @@ -307,5 +308,6 @@ class TestMonascaStatsd(unittest.TestCase): b, delta) + if __name__ == '__main__': unittest.main() -- GitLab From 6ecc0a59e9429acf0729d237cb5544d45aaa08fa Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 5 Apr 2020 09:59:11 +0200 Subject: [PATCH 60/80] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove obsolete sections from setup.cfg: * Wheel is not needed for python 3 only repo * Some other sections are obsolete - Update classifiers Change-Id: I73719cd22b52d9e35568d3d0e4e68846ab743522 --- setup.cfg | 12 ++++-------- setup.py | 9 --------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index d0e6715..4b085f4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ maintainer = monasca maintainer_email = monasca@lists.launchpad.net description-file = README.rst summary = Monasca statsd Python client -home-page = https://github.com/openstack/monasca-statsd +home-page = https://opendev.org/openstack/monasca-statsd keywords= openstack monitoring @@ -12,11 +12,14 @@ keywords= license = Apache-2 include_package_data = True test_suite = nose.collector +python-requires = >=3.6 classifier = Development Status :: 5 - Production/Stable License :: OSI Approved :: Apache Software License Topic :: System :: Monitoring Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -25,16 +28,9 @@ classifier = packages = monascastatsd -[global] -setup-hooks = - pbr.hooks.setup_hook - [pbr] autodoc_index_modules = True -[wheel] -universal = 1 - [egg_info] tag_build = tag_date = 0 diff --git a/setup.py b/setup.py index 566d844..cd35c3c 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) -- GitLab From d6e36cb0afe383c7d8973bd418a1b579bc7c3935 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Tue, 28 Apr 2020 14:36:12 +0000 Subject: [PATCH 61/80] Add Python3 victoria unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for victoria. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: I43a802996b1d26389e4a59ec170e246646de86b8 --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index d182c4f..4a1d91b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,7 @@ - check-requirements - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs check: jobs: - monasca-tempest-python3-influxdb: -- GitLab From d89dc30d64c73936c55ac448c28d10b14826d908 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 2 May 2020 07:48:13 -0500 Subject: [PATCH 62/80] Add py38 package metadata Now that we are running the Victoria tests that include a voting py38, we can now add the Python 3.8 metadata to the package information to reflect that support. Change-Id: If553d8ebb251b75fd942bc36a232f15c161b7234 Signed-off-by: Sean McGinnis --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 4b085f4..722f4e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,6 +23,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = -- GitLab From d0e8adedfd4d73d6661eb63272259fa1bd020a2c Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 12 May 2020 19:13:29 -0500 Subject: [PATCH 63/80] Fix hacking min version to 3.0.1 flake8 new release 3.8.0 added new checks and gate pep8 job start failing. hacking 3.0.1 fix the pinning of flake8 to avoid bringing in a new version with new checks. Though it is fixed in latest hacking but 2.0 and 3.0 has cap for flake8 as <4.0.0 which mean flake8 new version 3.9.0 can also break the pep8 job if new check are added. To avoid similar gate break in future, we need to bump the hacking min version. - http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014828.html Change-Id: Ic646e184486e75e5d269a6000c8ff1bc5f78d066 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 25e59f6..bf8a8f8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=3.0,<3.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -- GitLab From 460431085eef839ee33b240645abff2271db605b Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Tue, 19 May 2020 16:26:25 +0200 Subject: [PATCH 64/80] Add CONTRIBUTING.rst Change-Id: I9d8a12179bd16ff25f9b15b1bdc7cee59ae8a720 --- CONTRIBUTING.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 CONTRIBUTING.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..c860b7a --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,19 @@ +The source repository for this project can be found at: + + https://opendev.org/openstack/monasca-statsd + +Pull requests submitted through GitHub are not monitored. + +To start contributing to OpenStack, follow the steps in the contribution guide +to set up and use Gerrit: + + https://docs.openstack.org/contributors/code-and-documentation/quick-start.html + +Bugs should be filed on Storyboard: + + https://storyboard.openstack.org/#!/project/872 + +For more specific information about contributing to this repository, see the +Monasca contributor guide: + + https://docs.openstack.org/monasca-api/latest/contributor/contributing.html -- GitLab From fcb40ee791c987d6090f3a760a2b6271b7f0d855 Mon Sep 17 00:00:00 2001 From: Martin Chacon Piza Date: Wed, 27 May 2020 18:37:16 +0200 Subject: [PATCH 65/80] Fix and unify cover environment Fix cover environment and unify it accordingly to Project Testing Interface [1]. [1] https://governance.openstack.org/tc/reference/pti/python.html#coverage-jobs Change-Id: Ie82e6bf3964c84413e6af0c94e1212b7669de93b --- tox.ini | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index e9bfa8f..7f9a476 100644 --- a/tox.ini +++ b/tox.ini @@ -25,11 +25,14 @@ commands = stestr run {posargs} [testenv:cover] - +description = Calculates code coverage +setenv = + PYTHON=coverage run --source monascastatsd --parallel-mode commands = - coverage erase - python setup.py test --coverage --testr-args='{posargs}' --coverage-package-name=monascastatsd - coverage report + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:debug] commands = -- GitLab From aa83a72685203305530f4ec8eb02eb409f149e5a Mon Sep 17 00:00:00 2001 From: Masayuki Igawa Date: Tue, 21 Apr 2020 15:59:38 +0900 Subject: [PATCH 66/80] Remove .testr.conf This commit removes .testr.conf since this repo already has .stestr.conf. We just need .stestr.conf instead of .testr.conf. Change-Id: I30c04355c245ce2ad052b8573771af0c0fa3e8f4 --- .testr.conf | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .testr.conf diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 72195ed..0000000 --- a/.testr.conf +++ /dev/null @@ -1,9 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \ - ${PYTHON:-python} -m subunit.run discover -t ./ $OS_TEST_PATH $LISTOPT $IDOPTION - -test_id_option=--load-list $IDFILE -test_list_option=--list -group_regex=tests(?:\.|_)([^_]+) \ No newline at end of file -- GitLab From 8621c5439776729a49f19a1cb55caad2f49b654e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 9 Jun 2020 01:25:45 +0200 Subject: [PATCH 67/80] Use unittest.mock instead of mock The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: I8d9549e4653f4df7ec9f34f54f15bf0a18c9d8e2 --- lower-constraints.txt | 1 - test-requirements.txt | 1 - tests/test_monascastatsd.py | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index d185a87..b80bcde 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -17,7 +17,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 mox3==0.20.0 openstackdocstheme==1.18.1 os-client-config==1.28.0 diff --git a/test-requirements.txt b/test-requirements.txt index bf8a8f8..3d07f82 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0.0 # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 diff --git a/tests/test_monascastatsd.py b/tests/test_monascastatsd.py index e8989be..d8692c8 100644 --- a/tests/test_monascastatsd.py +++ b/tests/test_monascastatsd.py @@ -48,7 +48,7 @@ import unittest import monascastatsd as mstatsd -import mock +from unittest import mock import six from six.moves import range -- GitLab From 3ecf4480035c3f671344d4272549e3a4a8306141 Mon Sep 17 00:00:00 2001 From: jiasirui Date: Tue, 16 Jun 2020 17:25:33 +0800 Subject: [PATCH 68/80] change a better title in README.rst Change-Id: I3a752f3bad21e594cb4b4503128973f25e0c3836 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3a0b3ff..2d6a32c 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -Team and repository tags +Openstack Monasca Statsd ======================== .. image:: https://governance.openstack.org/tc/badges/monasca-statsd.svg -- GitLab From cd6e0140c2d72c1b011e64dd0c957aef9f1c4e40 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 8 Sep 2020 09:18:53 +0200 Subject: [PATCH 69/80] Now packaging 2.1.0. --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e45f9b5..340c64b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -python-monasca-statsd (1.11.0-3) UNRELEASED; urgency=medium +python-monasca-statsd (2.1.0-1) experimental; urgency=medium + [ Ondřej Nový ] * Use debhelper-compat instead of debian/compat. * Bump Standards-Version to 4.4.1. - -- Ondřej Nový Thu, 18 Jul 2019 16:39:53 +0200 + [ Thomas Goirand ] + * New upstream release. + + -- Thomas Goirand Tue, 08 Sep 2020 09:18:39 +0200 python-monasca-statsd (1.11.0-2) unstable; urgency=medium -- GitLab From 781fcefc50d07121922e9a3a2c78ac8acdf27f6f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 8 Sep 2020 09:19:28 +0200 Subject: [PATCH 70/80] Removed python3-mock from build-depends. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 340c64b..fcadf5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ python-monasca-statsd (2.1.0-1) experimental; urgency=medium [ Thomas Goirand ] * New upstream release. + * Removed python3-mock from build-depends. -- Thomas Goirand Tue, 08 Sep 2020 09:18:39 +0200 diff --git a/debian/control b/debian/control index 1e15b9a..2bca86b 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends: Build-Depends-Indep: python3-coverage, python3-hacking, - python3-mock, python3-oslotest, python3-six, python3-stestr, -- GitLab From 0e2561c6ef96f0629fede9f220dfdea637370c19 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Wed, 9 Sep 2020 22:23:40 +0000 Subject: [PATCH 71/80] Add Python3 wallaby unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for wallaby. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Icdae7f5bb8fc45551f65eaf2d811d00de2fc9b4f --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 4a1d91b..9b18ec8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -3,7 +3,7 @@ - check-requirements - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-victoria-jobs + - openstack-python3-wallaby-jobs check: jobs: - monasca-tempest-python3-influxdb: -- GitLab From b9451e9d149497778cd35480db13fdb5cc29888f Mon Sep 17 00:00:00 2001 From: zhangchun Date: Sun, 20 Sep 2020 13:56:38 +0000 Subject: [PATCH 72/80] bump py37 to py38 in tox.ini in 'victoria' cycle, we should test py38 by default. Trivial change Change-Id: Idd51da2a7e98e31bea6459a10f91d7eecf91d100 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7f9a476..e0e792a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,pep8,cover +envlist = py38,pep8,cover minversion = 2.5 skipsdist = True -- GitLab From 16a8f9ca300001cd309db8cfee6263e84b812f9c Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 17 Oct 2020 16:46:02 +0200 Subject: [PATCH 73/80] Uploading to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fcadf5a..906dbf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-monasca-statsd (2.1.0-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Sat, 17 Oct 2020 16:45:51 +0200 + python-monasca-statsd (2.1.0-1) experimental; urgency=medium [ Ondřej Nový ] -- GitLab From d8f504f0f55edf4a541028716bb6a3e1bba85f7e Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 17 Oct 2020 16:46:51 +0200 Subject: [PATCH 74/80] Fixed debian/watch. --- debian/changelog | 1 + debian/watch | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 906dbf5..551e723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-monasca-statsd (2.1.0-2) unstable; urgency=medium * Uploading to unstable. + * Fixed debian/watch. -- Thomas Goirand Sat, 17 Oct 2020 16:45:51 +0200 diff --git a/debian/watch b/debian/watch index 3c53006..271b06a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 -opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ -https://pypi.debian.net/monasca-statsd/monasca-statsd-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) - +opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ +https://github.com/openstack/monasca-statsd/tags .*/(\d[brc\d\.]+)\.tar\.gz -- GitLab From d3dd9f393529d6c965ab8e252e90360071090041 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 17 Oct 2020 16:47:10 +0200 Subject: [PATCH 75/80] Add a debian/salsa-ci.yml. --- debian/changelog | 1 + debian/salsa-ci.yml | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/salsa-ci.yml diff --git a/debian/changelog b/debian/changelog index 551e723..dbef715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-monasca-statsd (2.1.0-2) unstable; urgency=medium * Uploading to unstable. * Fixed debian/watch. + * Add a debian/salsa-ci.yml. -- Thomas Goirand Sat, 17 Oct 2020 16:45:51 +0200 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..0c22dc4 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,3 @@ +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 -- GitLab From ed2c0d24f7bb4bf1e91beb7ff815bc008868efe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Thu, 7 Jan 2021 14:22:49 +0100 Subject: [PATCH 76/80] Add doc/requirements We need to specify doc requirements in doc/requirements.txt to avoid problems with the pip resolver [1] for the release team [2][3]. Removed specific doc requirements from test-requirements.txt. The problem here is that this repos haven't doc/requirements.txt file and by default in this case zuul will use the test-requirements.txt file to pull requirements [4]. This requirements file contains extra requirements like flake8 that collided with those allowed in our job environment and so the new pip resolver fails to install these requirements and the job exits in error. This project meet the conditions leading to the bug. [1] http://lists.openstack.org/pipermail/release-job-failures/2021-January/001500.html [2] http://lists.openstack.org/pipermail/openstack-discuss/2021-January/019611.html [3] http://lists.openstack.org/pipermail/openstack-discuss/2021-January/019612.html [4] https://opendev.org/zuul/zuul-jobs/src/branch/master/roles/ensure-sphinx/tasks/main.yaml#L36 Change-Id: Ic771f9dfa0ee59c05f986bdbf24255dda87cc977 --- doc/requirements.txt | 3 +++ lower-constraints.txt | 6 +++--- requirements.txt | 2 +- test-requirements.txt | 3 --- tox.ini | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..fb31f9f --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,3 @@ +sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD +oslosphinx>=4.7.0 # Apache-2.0 +openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index b80bcde..cc32fbc 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,5 +1,5 @@ alabaster==0.7.10 -appdirs==1.3.0 +appdirs==1.4.0 Babel==2.3.4 bandit==1.4.0 coverage==4.0 @@ -16,7 +16,7 @@ Jinja2==2.10 keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 -mccabe==0.2.1 +mccabe==0.6.0 mox3==0.20.0 openstackdocstheme==1.18.1 os-client-config==1.28.0 @@ -31,7 +31,7 @@ pytz==2013.6 PyYAML==3.12 requests==2.14.2 requestsexceptions==1.2.0 -six==1.10.0 +six==1.12.0 smmap==0.9.0 snowballstemmer==1.2.1 Sphinx==1.6.5 diff --git a/requirements.txt b/requirements.txt index 3840e1d..e6d6e11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -six>=1.10.0 # MIT +six>=1.12.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 3d07f82..9cc0447 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD -oslosphinx>=4.7.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index e0e792a..a1b32e6 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,8 @@ commands = oslo_debug_helper -t {toxinidir}/tests {posargs} [testenv:docs] +deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build python setup.py build_sphinx -- GitLab From db374f29487923f9904fb0f5577371bde5c7779e Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Fri, 20 Aug 2021 12:30:09 +0200 Subject: [PATCH 77/80] Release to unstable --- debian/changelog | 8 ++++++++ debian/control | 1 + debian/copyright | 1 + 3 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index dbef715..d310800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-monasca-statsd (2.2.0-1) unstable; urgency=medium + + * d/copyright: Add me to copyright file + * d/control: Add me to uploaders field + * New upstream version + + -- Michal Arbet Fri, 20 Aug 2021 12:29:29 +0200 + python-monasca-statsd (2.1.0-2) unstable; urgency=medium * Uploading to unstable. diff --git a/debian/control b/debian/control index 2bca86b..eb69419 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Debian OpenStack Uploaders: Thomas Goirand , + Michal Arbet , Build-Depends: debhelper-compat (= 10), dh-python, diff --git a/debian/copyright b/debian/copyright index 5ed0846..0cda7ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,7 @@ License: Apache-2-and-BSD-3-clause Files: debian/* Copyright: (c) 2017, Thomas Goirand + (c) 2021, Michal Arbet License: Apache-2-and-BSD-3-clause License: Apache-2-and-BSD-3-clause -- GitLab From cc5bc2c39a89d70d98ed891f9fe7066a4f7269c9 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 11 Sep 2021 06:04:39 +0000 Subject: [PATCH 78/80] Bump debhelper from old 10 to 13. + Replace python_distutils buildsystem with pybuild. Changes-By: lintian-brush Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d310800..40edbca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-monasca-statsd (2.2.0-2) UNRELEASED; urgency=medium + + * Bump debhelper from old 10 to 13. + + Replace python_distutils buildsystem with pybuild. + + -- Debian Janitor Sat, 11 Sep 2021 06:04:39 -0000 + python-monasca-statsd (2.2.0-1) unstable; urgency=medium * d/copyright: Add me to copyright file diff --git a/debian/control b/debian/control index eb69419..56852ee 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Michal Arbet , Build-Depends: - debhelper-compat (= 10), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, diff --git a/debian/rules b/debian/rules index 9a854f1..4704275 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ UPSTREAM_GIT := https://github.com/openstack/monasca-statsd.git include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python3 + dh $@ --buildsystem=pybuild --with python3 override_dh_auto_clean: rm -rf build -- GitLab From dd5564e582a40577be348b912ba557c9b890a44e Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 11 Sep 2021 06:04:41 +0000 Subject: [PATCH 79/80] Set upstream metadata fields: Repository, Repository-Browse. Changes-By: lintian-brush Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html Fixes: lintian: upstream-metadata-missing-repository See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html --- debian/changelog | 1 + debian/upstream/metadata | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 40edbca..fdfbecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-monasca-statsd (2.2.0-2) UNRELEASED; urgency=medium * Bump debhelper from old 10 to 13. + Replace python_distutils buildsystem with pybuild. + * Set upstream metadata fields: Repository, Repository-Browse. -- Debian Janitor Sat, 11 Sep 2021 06:04:39 -0000 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..e955d47 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,3 @@ +--- +Repository: https://github.com/openstack/monasca-statsd.git +Repository-Browse: https://github.com/openstack/monasca-statsd -- GitLab From 61b338f18713a81e41778d76dd1374b4219b495d Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 11 Sep 2021 06:04:42 +0000 Subject: [PATCH 80/80] Update standards version to 4.5.1, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fdfbecc..913d1db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-monasca-statsd (2.2.0-2) UNRELEASED; urgency=medium * Bump debhelper from old 10 to 13. + Replace python_distutils buildsystem with pybuild. * Set upstream metadata fields: Repository, Repository-Browse. + * Update standards version to 4.5.1, no changes needed. -- Debian Janitor Sat, 11 Sep 2021 06:04:39 -0000 diff --git a/debian/control b/debian/control index 56852ee..978238b 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends-Indep: python3-oslotest, python3-six, python3-stestr, -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-monasca-statsd.git Homepage: https://github.com/openstack/monasca-statsd -- GitLab