[RELEASE] version: 0.0.49.

Fixed #5
decryptus · Jan 16, 2023 · e4c6f15 · e4c6f15
1 parent d98f261
commit e4c6f15
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,16 @@
+monit-docker (0.0.49) unstable; urgency=medium
+
+  * [RELEASE] version: 0.0.49.
+  * Fixed #5
+
+ -- Adrien DELLE CAVE (Decryptus) <adrien.delle.cave@commandersact.com>  Mon, 16 Jan 2023 04:59:28 +0100
+
+monit-docker (0.0.48) unstable; urgency=medium
+
+  * [RELEASE] version: 0.0.48.
+
+ -- Adrien DELLE CAVE (Decryptus) <adrien.delle.cave@commandersact.com>  Sat, 29 Oct 2022 08:25:38 +0200
+
 monit-docker (0.0.47) unstable; urgency=medium
 
   * Fixed #4

diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-0.0.47
+0.0.49
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.47
+0.0.49
diff --git a/bin/monit-docker b/bin/monit-docker
@@ -8,7 +8,7 @@ monit-docker
 
 from __future__ import absolute_import
 
-__version__ = '0.0.47'
+__version__ = '0.0.49'
 
 import argparse
 import codecs
@@ -633,8 +633,11 @@ class MonitDockerSubCmdStats(MonitDockerSubCmdAbstract):
 
         if cur_stats.get('online_cpus'):
             online_cpus = cur_stats['online_cpus']
-        else:
+        elif cur_stats['cpu_usage'].get('percpu_usage'):
             online_cpus = len(cur_stats['cpu_usage']['percpu_usage'])
+        else:
+            LOG.warning("unable to get online cpus information")
+            return r
 
         if cpu_delta > 0.0 and sys_delta > 0.0:
             r = (cpu_delta / sys_delta) * online_cpus * 100.0

diff --git a/debian/control b/debian/control
@@ -3,14 +3,17 @@ Section: net
 Priority: optional
 Maintainer: DevOps Team Fjord Technologies
 Uploaders: DevOps Team Fjord Technologies
-Build-Depends: debhelper (>= 7), dh-python, python (>= 2.7~), python-setuptools
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7), dh-python, lsb-release, python (>= 2.7~) | python2 (>= 2.7~) | python3 (>= 3.9~), python-setuptools (<< 44.1~) | python3-setuptools (>= 44.1~), python-yaml | python3-yaml, sed
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.9
+XS-Python-Version: >= 2.7
+XS-Python3-Version: >= 3.9
 Homepage: https://www.commandersact.com
 
 Package: monit-docker
 Architecture: all
 Homepage: https://www.commandersact.com
-Depends: ${misc:Depends}, python (>= 2.7~)
-Pre-Depends: libffi-dev, lsb-release, python-dev (>= 2.7~), python-backports.ssl-match-hostname, python-pip, python-setuptools
+Depends: ${misc:Depends}, python (>= 2.7~) | python2 (>= 2.7~) | python3 (>= 3.9~)
+Pre-Depends: python-dev (>= 2.7~) | python2-dev (>= 2.7~) | python3-dev (>= 3.9~), python-pip (<< 20.3~) | python3-pip (>= 20.3~), python-setuptools (<< 44.1~) | python3-setuptools (>= 44.1~)
 Description: Fjord Technologies monit-docker package
diff --git a/debian/rules b/debian/rules
@@ -10,8 +10,18 @@ export PYBUILD_VERBOSE=1
 
 export PYBUILD_NAME=monit-docker
 
+DISTRIB_VERSION=$(shell lsb_release -s -r | sed -nre 's/^[^0-9]*([0-9]+).*/\1/p')
+
+ifeq ($(shell test $(DISTRIB_VERSION) -lt 11; echo $$?),0)
+	DH_WITH_PYTHON=python2
+	export PYBUILD_DISABLE_python3=1
+else
+	DH_WITH_PYTHON=python3
+	export PYBUILD_DISABLE_python2=1
+endif
+
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with $(DH_WITH_PYTHON) --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install

diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,4 @@ Mako
 pyOpenSSL>=20.0.0
 PyYAML>=3.10
 six>=1.13.0
-sonicprobe>=0.3.48
+sonicprobe>=0.3.51
diff --git a/setup.yml b/setup.yml
@@ -3,9 +3,9 @@ name: monit-docker
 description: monit-docker
 author: Adrien Delle Cave
 author_email: pypi@doowan.net
-copyright: '2019-2022 Adrien Delle Cave'
-release: '0.0.47'
-version: '0.0.47'
+copyright: '2019-2023 Adrien Delle Cave'
+release: '0.0.49'
+version: '0.0.49'
 license: License GPL-3
 url: https://github.com/decryptus/monit-docker
 python_requires: