From a72cc9cf389fd156c6bb958e1f6df7b9fd296125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20R=C3=B6hrich?= Date: Fri, 8 Nov 2024 10:39:45 +0100 Subject: [PATCH] Fixups and Python 3.11 Environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixups: - Remove debug output - Cleanup format strings in ClusterManager class Tox: - Add Python 3.11 environment - Drop Python 3.6 environment Revert change to two assignment expressions. Without the need to further support Python 3.6 assignment expressions can be used in conditionals, i.e. `if (cs := data.get(...)):`. Signed-off-by: Moritz Röhrich --- apiclient/rancher_api/api.py | 4 ---- apiclient/rancher_api/managers.py | 7 +++++-- harvester_e2e_tests/fixtures/settings.py | 3 +-- harvester_e2e_tests/integrations/test_upgrade.py | 3 +-- py36_pytest.ini | 2 -- tox.ini | 9 ++++----- 6 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 py36_pytest.ini diff --git a/apiclient/rancher_api/api.py b/apiclient/rancher_api/api.py index 28d33f13f..d40c30e64 100644 --- a/apiclient/rancher_api/api.py +++ b/apiclient/rancher_api/api.py @@ -68,25 +68,21 @@ def __repr__(self): def _get(self, path, **kwargs): url = urljoin(self.endpoint, path) resp = self.session.get(url, **kwargs) - print(f"{resp.request.method} {resp.request.url}") return resp def _post(self, path, **kwargs): url = urljoin(self.endpoint, path) resp = self.session.post(url, **kwargs) - print(f"{resp.request.method} {resp.request.url}") return resp def _put(self, path, **kwargs): url = urljoin(self.endpoint, path) resp = self.session.put(url, **kwargs) - print(f"{resp.request.method} {resp.request.url}") return resp def _delete(self, path, **kwargs): url = urljoin(self.endpoint, path) resp = self.session.delete(url, **kwargs) - print(f"{resp.request.method} {resp.request.url}") return resp def authenticate(self, user, passwd, **kwargs): diff --git a/apiclient/rancher_api/managers.py b/apiclient/rancher_api/managers.py index efcf7348b..d3ec94510 100644 --- a/apiclient/rancher_api/managers.py +++ b/apiclient/rancher_api/managers.py @@ -810,8 +810,11 @@ def delete(self, name, *, raw=False): return self._delete(self.PATH_fmt.format(uid=name), raw=raw) def generate_kubeconfig(self, name, *, raw=False): - params = {'action': 'generateKubeconfig'} - return self._create(f"v3/clusters/{name}", raw=raw, params=params) + return self._create( + self.PATH1_fmt.format(uid=name), + raw=raw, + params={'action': 'generateKubeconfig'} + ) def explore(self, name): from .cluster_api import ClusterExploreAPI # circular dependency diff --git a/harvester_e2e_tests/fixtures/settings.py b/harvester_e2e_tests/fixtures/settings.py index 9122554e1..74b9946e2 100644 --- a/harvester_e2e_tests/fixtures/settings.py +++ b/harvester_e2e_tests/fixtures/settings.py @@ -16,8 +16,7 @@ def __init__(self): def _storage_net_configured(self): code, data = self.settings.get('storage-network') - cs = data.get('status', {}).get('conditions') - if cs: + if (cs := data.get('status', {}).get('conditions')): if 'True' == cs[-1].get('status') and 'Completed' == cs[-1].get('reason'): return True, (code, data) return False, (code, data) diff --git a/harvester_e2e_tests/integrations/test_upgrade.py b/harvester_e2e_tests/integrations/test_upgrade.py index 15cce1606..b7fac4ba1 100644 --- a/harvester_e2e_tests/integrations/test_upgrade.py +++ b/harvester_e2e_tests/integrations/test_upgrade.py @@ -507,8 +507,7 @@ def test_degraded_volume(self, api_client, wait_timeout, vm_shell_from_host, # https://github.com/harvester/harvester/issues/6425 code, data = api_client.hosts.get() assert 200 == code, (code, data) - cluster_size = len(data['data']) - if cluster_size < 3: + if (cluster_size := len(data['data'])) < 3: pytest.skip( f"Degraded volumes only checked on 3+ nodes cluster, skip on {cluster_size}." ) diff --git a/py36_pytest.ini b/py36_pytest.ini deleted file mode 100644 index 13a2ebbaf..000000000 --- a/py36_pytest.ini +++ /dev/null @@ -1,2 +0,0 @@ -[pytest] -render_collapsed = True diff --git a/tox.ini b/tox.ini index 4d8f351be..72bd2d7c8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,py38,pep8,testenv +envlist = py38,py311,pep8,testenv # TODO(gyee): we are not distributing the test code right now. Will need # to revisit this once we have majority of the tests developed. skipsdist = True @@ -20,6 +20,9 @@ commands = pytest -c {env:PYTEST_CONFIG:{toxinidir}/tox.ini} {posargs} passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VERSION +[testenv:py311] +basepython = python3.11 + [testenv:pep8] deps = flake8 commands = @@ -31,7 +34,3 @@ max-line-length = 99 [pytest] initial_sort = original render_collapsed = all - -[testenv:py36] -setenv = - PYTEST_CONFIG = {toxinidir}/py36_pytest.ini \ No newline at end of file