Merge "Replace distutils"

distutils was deprecated in Python 3.10 and was removed in Python
3.12 [1].

[1] https://docs.python.org//3.10/library/distutils.html

Change-Id: Iade3ecba97cb35f0afcb8e9fbde8dd1095b6fb47

cloudkittyclient/utils.py

@@ -13,7 +13,6 @@
 #    under the License.
 #
 import inspect
-import sys
 
 import pbr.version
 
@@ -82,11 +81,6 @@ def format_http_errors(ignore):
     """
 
     def wrap(cls):
-        # If you want pretty errors, use python3.
-        # __qualname__ does not exist in python 2
-        if sys.version_info.major < 3:
-            return cls
-
         def predicate(item):
             # This avoids decorating functions of parent classes
             return (inspect.isfunction(item)

cloudkittyclient/v2/scope.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
+from oslo_utils import strutils
+
 from cloudkittyclient.common import base
 from cloudkittyclient import exc
 
-from distutils.util import strtobool
-
 
 class ScopeManager(base.BaseManager):
     """Class used to handle /v2/scope endpoint"""
@@ -133,7 +133,8 @@ class ScopeManager(base.BaseManager):
         )
 
         if kwargs.get('active'):
-            body['active'] = strtobool(kwargs.get('active'))
+            body['active'] = strutils.bool_from_string(
+                kwargs.get('active'), strict=True)
 
         # Stripping None
         body = dict(filter(lambda elem: elem[1] is not None, body.items()))

cloudkittyclient/v2/summary_cli.py

@@ -35,10 +35,20 @@ class CliSummaryGet(lister.Lister):
                             help='Maximal number of elements')
         parser.add_argument('-g', '--groupby', type=str, action='append',
                             help='Attribute to group the summary by. Can be '
-                            'specified several times')
+                                 'specified several times. One can also group '
+                                 'by different time options such as: "time-d" '
+                                 'to group by day of the year, "time-w" to '
+                                 'group by week of the year, "time-m" to '
+                                 'group by month, and "time-y" to group data '
+                                 'by year.')
         parser.add_argument('--filter', type=filter_, action='append',
                             help="Optional filter, in 'key:value' format. Can "
-                            "be specified several times.")
+                                 "be specified several times. It is also "
+                                 "possible to filter data using the group by "
+                                 "values. However, one needs to group by as "
+                                 "well; for instance, if one wants to filter "
+                                 "by resource id (id), then we need to group "
+                                 "by id via the option '-g id'.")
         parser.add_argument('-b', '--begin', type=timeutils.parse_isotime,
                             help="Start of the period to query, in iso8601 "
                             "format. Example: 2019-05-01T00:00:00Z.")

releasenotes/source/2024.2.rst

@@ -0,0 +1,6 @@
+===========================
+2024.2 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2024.2

releasenotes/source/index.rst

@@ -8,6 +8,7 @@ Contents
    :maxdepth: 2
 
    unreleased
+   2024.2
    2024.1
    2023.2
    2023.1

requirements.txt

@@ -2,10 +2,6 @@
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
 
-# 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.
-
 pbr>=5.5.1 # Apache-2.0
 cliff>=3.5.0 # Apache-2.0
 keystoneauth1>=4.3.0 # Apache-2.0

test-requirements.txt

@@ -1,14 +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.
-
-hacking>=3.0.1,<3.1.0 # Apache-2.0
-
-# remove this pyflakes from here once you bump the
-# hacking to 3.2.0 or above. hacking 3.2.0 takes
-# care of pyflakes version compatibilty.
-pyflakes>=2.1.1
-
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=1.4.0 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0