variaous fixes

Author: skatsaounis

.github/workflows/ci.yml

@@ -10,15 +10,15 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - name: Repository checkout
       uses: actions/checkout@v3
 
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.7"
+        python-version: "3.8"
 
     - name: Install dependencies
       run: |
@@ -29,11 +29,10 @@ jobs:
         tox -e lint
 
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"

integrate/test.py

@@ -1,6 +1,6 @@
 """Integration tests for `maas.client`."""
 
-from collections import Mapping
+from collections.abc import Mapping
 from datetime import datetime
 from http import HTTPStatus
 import io

maas/client/bones/__init__.py

@@ -462,7 +462,7 @@ async def dispatch(self, uri, body, headers):
         library.
         """
         insecure = self.action.handler.session.insecure
-        connector = aiohttp.TCPConnector(verify_ssl=(not insecure))
+        connector = aiohttp.TCPConnector(ssl=(not insecure))
         session = aiohttp.ClientSession(connector=connector)
         async with session:
             response = await session.request(

maas/client/bones/helpers.py

@@ -40,7 +40,7 @@ async def fetch_api_description(
 ):
     """Fetch the API description from the remote MAAS instance."""
     url_describe = urljoin(_ensure_url_string(url), "describe/")
-    connector = aiohttp.TCPConnector(verify_ssl=(not insecure))
+    connector = aiohttp.TCPConnector(ssl=(not insecure))
     session = aiohttp.ClientSession(connector=connector)
     async with session, session.get(url_describe) as response:
         if response.status != HTTPStatus.OK:
@@ -270,11 +270,11 @@ def check_response_is_okay(response):
         if response.status != HTTPStatus.OK:
             raise RemoteError(
                 "{0} -> {1.status} {1.reason}".format(
-                    response.url_obj.human_repr(), response
+                    response.url.human_repr(), response
                 )
             )
 
-    connector = aiohttp.TCPConnector(verify_ssl=(not insecure))
+    connector = aiohttp.TCPConnector(ssl=(not insecure))
     session = aiohttp.ClientSession(connector=connector)
     async with session:
         # Check that this server supports `authenticate-api`.

maas/client/flesh/tests/test_controllers.py

@@ -73,7 +73,7 @@ def test_returns_table_with_controllers(self):
         output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
-        self.assertEquals(
+        self.assertEqual(
             [
                 {"name": "hostname", "title": "Hostname"},
                 {"name": "node_type", "title": "Type"},
@@ -93,7 +93,7 @@ def test_returns_table_with_controllers(self):
             }
             for controller in racks + regions
         }
-        self.assertEquals(
+        self.assertEqual(
             sorted(controller_output.values(), key=itemgetter("hostname")),
             output["data"],
         )

maas/client/flesh/tests/test_devices.py

@@ -52,7 +52,7 @@ def test_returns_table_with_devices(self):
         output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
-        self.assertEquals(
+        self.assertEqual(
             [
                 {"name": "hostname", "title": "Hostname"},
                 {"name": "owner", "title": "Owner"},
@@ -76,7 +76,7 @@ def test_returns_table_with_devices(self):
             ],
             key=itemgetter("hostname"),
         )
-        self.assertEquals(devices_output, output["data"])
+        self.assertEqual(devices_output, output["data"])
 
     def test_calls_handler_with_hostnames(self):
         origin = make_origin()

maas/client/flesh/tests/test_machines.py

@@ -60,7 +60,7 @@ def test_returns_table_with_machines(self):
         output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
-        self.assertEquals(
+        self.assertEqual(
             [
                 {"name": "hostname", "title": "Hostname"},
                 {"name": "power", "title": "Power"},
@@ -91,7 +91,7 @@ def test_returns_table_with_machines(self):
             ],
             key=itemgetter("hostname"),
         )
-        self.assertEquals(machines_output, output["data"])
+        self.assertEqual(machines_output, output["data"])
 
     def test_calls_handler_with_hostnames(self):
         origin = make_origin()

maas/client/flesh/tests/test_nodes.py

@@ -51,7 +51,7 @@ def test_returns_table_with_nodes(self):
         output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
-        self.assertEquals(
+        self.assertEqual(
             [
                 {"name": "hostname", "title": "Hostname"},
                 {"name": "node_type", "title": "Type"},
@@ -65,7 +65,7 @@ def test_returns_table_with_nodes(self):
             ],
             key=itemgetter("hostname"),
         )
-        self.assertEquals(nodes_output, output["data"])
+        self.assertEqual(nodes_output, output["data"])
 
     def test_calls_handler_with_hostnames(self):
         origin = make_origin()

maas/client/utils/tests/test.py

@@ -550,4 +550,4 @@ class TestRemoveNone(TestCase):
 
     def test_removes_all_None_values(self):
         data = {"None": None, "another_None": None, "keep": "value"}
-        self.assertEquals({"keep": "value"}, utils.remove_None(data))
+        self.assertEqual({"keep": "value"}, utils.remove_None(data))

maas/client/utils/tests/test_diff.py

@@ -26,27 +26,27 @@ class TestCalculateDictDiff(TestCase):
     def test_calcs_no_difference(self):
         orig_data = {"key1": "value1", "key2": "value2"}
         new_data = copy.deepcopy(orig_data)
-        self.assertEquals({}, calculate_dict_diff(orig_data, new_data))
+        self.assertEqual({}, calculate_dict_diff(orig_data, new_data))
 
     def test_calcs_changed_value(self):
         orig_data = {"key1": "value1", "key2": "value2"}
         new_data = copy.deepcopy(orig_data)
         new_data["key2"] = "new_value"
-        self.assertEquals(
+        self.assertEqual(
             {"key2": "new_value"}, calculate_dict_diff(orig_data, new_data)
         )
 
     def test_calcs_deleted_value(self):
         orig_data = {"key1": "value1", "key2": "value2"}
         new_data = copy.deepcopy(orig_data)
         del new_data["key2"]
-        self.assertEquals({"key2": ""}, calculate_dict_diff(orig_data, new_data))
+        self.assertEqual({"key2": ""}, calculate_dict_diff(orig_data, new_data))
 
     def test_calcs_changes_and_deleted(self):
         orig_data = {"key1": "value1", "key2": "value2"}
         new_data = copy.deepcopy(orig_data)
         new_data["key1"] = "new_value"
         del new_data["key2"]
-        self.assertEquals(
+        self.assertEqual(
             {"key1": "new_value", "key2": ""}, calculate_dict_diff(orig_data, new_data)
         )