Merge "Drop unused tempest from test requirements"

Merge "Make watcherclient/shell.py reproducible"
Merge "Get rid of distutils"
2024-12-21 01:35:09 +00:00 · 2024-12-06 14:15:22 +00:00 · 2024-12-06 13:28:17 +00:00 · 2024-10-12 00:07:02 +09:00 · 2024-10-02 23:24:03 +09:00 · 2021-12-28 19:33:55 +01:00
3 changed files with 11 additions and 8 deletions
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,4 +6,3 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-tempest>=17.1.0 # Apache-2.0
--- a/watcherclient/common/httpclient.py
+++ b/watcherclient/common/httpclient.py
@@ -14,7 +14,6 @@
 #    under the License.

 import copy
-from distutils import version
 import functools
 import hashlib
 import http.client
@@ -123,16 +122,19 @@ class VersionNegotiationMixin(object):
                % {'req': self.os_infra_optim_api_version,
                   'min': min_ver, 'max': max_ver}))

-        negotiated_ver = str(
-            min(version.StrictVersion(self.os_infra_optim_api_version),
-                version.StrictVersion(max_ver)))
+        negotiated_ver = api_versioning.APIVersion(
+            self.os_infra_optim_api_version)
+        min_ver = api_versioning.APIVersion(min_ver)
+        max_ver = api_versioning.APIVersion(max_ver)
+        if negotiated_ver > max_ver:
+            negotiated_ver = max_ver
        if negotiated_ver < min_ver:
            negotiated_ver = min_ver
        # server handles microversions, but doesn't support
        # the requested version, so try a negotiated version
        self.api_version_select_state = 'negotiated'
-        self.os_infra_optim_api_version = negotiated_ver
-        LOG.debug('Negotiated API version is %s', negotiated_ver)
+        self.os_infra_optim_api_version = negotiated_ver.get_string()
+        LOG.debug('Negotiated API version is %s', negotiated_ver.get_string())

        return negotiated_ver

--- a/watcherclient/shell.py
+++ b/watcherclient/shell.py
@@ -203,7 +203,9 @@ class WatcherShell(app.App):
            LOG.info("END return value: %s", ret_val)


-def main(argv=sys.argv[1:]):
+def main(argv=None):
+    if argv is None:
+        argv = sys.argv[1:]
    watcher_app = WatcherShell()
    return watcher_app.run(argv)
Author	SHA1	Message	Date
Zuul	d801e89157	Merge "Drop unused tempest from test requirements"	2024-12-21 01:35:09 +00:00
Zuul	2af23e860d	Merge "Make watcherclient/shell.py reproducible"	2024-12-06 14:15:22 +00:00
Zuul	4317c283cc	Merge "Get rid of distutils"	2024-12-06 13:28:17 +00:00
Takashi Kajinami	a2e4e22ce8	Drop unused tempest from test requirements None of the tests implemented in this repository depend on tempest. Change-Id: Ie06e1f3e3990ba5d167f5331cb12b845ab809e6b	2024-10-12 00:07:02 +09:00
Takashi Kajinami	be7ee7347a	Get rid of distutils ... because it was already removed from Python 3.12 . Change-Id: Ie809a48ce49d3fd6139c55109c9ed92b852ad41e	2024-10-02 23:24:03 +09:00
Thomas Goirand	834ab29878	Make watcherclient/shell.py reproducible Hi, Whilst working on the Reproducible Builds effort [0] we noticed that python-watcherclient could not be built reproducibly. This is because the documentation generates automatic documentation for the "main()" entrypoint method's arguments, one of which is "sys.argv". During document generation this results in documentation examples like: def main(argv=['-b', 'html', 'doc/source', '«ABSOLUTE_BUILD_DIR»/debian/python-watcherclient-doc/usr/.../html']): … etc. Patch attached that sets "None" instead but retains the existing fallback logic. [0] https://reproducible-builds.org/ Please note that this was reported in the Debian tracker: https://bugs.debian.org/960607 and that the fix was applied to the Debian package. Change-Id: I502bb2d11d90ce4c46c14904a8c048ea824f11d5	2021-12-28 19:33:55 +01:00