fix black warnings; update for yaml issue; bump version; add 3.9 to ci (#268)

* fix black warnings; update for yaml issue; add 3.9 to ci

* match the versions in setup.py with the ci

Author: mkinney

.github/workflows/ci.yml

@@ -36,6 +36,7 @@ jobs:
           - "3.6"
           - "3.7"
           - "3.8"
+          - "3.9"
     steps:
     - name: Repository checkout
       uses: actions/checkout@v2

maas/client/errors.py

@@ -10,15 +10,15 @@ def __init__(self, msg, obj):
 
 
 class OperationNotAllowed(Exception):
-    """ MAAS says this operation cannot be performed. """
+    """MAAS says this operation cannot be performed."""
 
 
 class ObjectNotLoaded(Exception):
-    """ Object is not loaded. """
+    """Object is not loaded."""
 
 
 class CannotDelete(Exception):
-    """ Object cannot be deleted. """
+    """Object cannot be deleted."""
 
 
 class PowerError(MAASException):

maas/client/flesh/tests/test_controllers.py

@@ -70,7 +70,7 @@ def test_returns_table_with_controllers(self):
         cmd = controllers.cmd_controllers(parser)
         subparser = controllers.cmd_controllers.register(parser)
         options = subparser.parse_args([])
-        output = yaml.load(
+        output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
         self.assertEquals(

maas/client/flesh/tests/test_devices.py

@@ -49,7 +49,7 @@ def test_returns_table_with_devices(self):
         cmd = devices.cmd_devices(parser)
         subparser = devices.cmd_devices.register(parser)
         options = subparser.parse_args([])
-        output = yaml.load(
+        output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
         self.assertEquals(

maas/client/flesh/tests/test_nodes.py

@@ -48,7 +48,7 @@ def test_returns_table_with_nodes(self):
         cmd = nodes.cmd_nodes(parser)
         subparser = nodes.cmd_nodes.register(parser)
         options = subparser.parse_args([])
-        output = yaml.load(
+        output = yaml.safe_load(
             cmd.execute(origin, options, target=tabular.RenderTarget.yaml)
         )
         self.assertEquals(

maas/client/viscera/tests/test_sshkeys.py

@@ -17,15 +17,15 @@ def make_origin():
 
 class TestSSHKeys(TestCase):
     def test__sshkeys_create(self):
-        """ SSHKeys.create() returns a new SSHKey. """
+        """SSHKeys.create() returns a new SSHKey."""
         SSHKeys = make_origin().SSHKeys
         key = make_string_without_spaces()
         SSHKeys._handler.create.return_value = {"id": 1, "key": key, "keysource": ""}
         SSHKeys.create(key=key)
         SSHKeys._handler.create.assert_called_once_with(key=key)
 
     def test__sshkeys_read(self):
-        """ SSHKeys.read() returns a list of SSH keys. """
+        """SSHKeys.read() returns a list of SSH keys."""
         SSHKeys = make_origin().SSHKeys
         keys = [
             {
@@ -42,7 +42,7 @@ def test__sshkeys_read(self):
 
 class TestSSHKey(TestCase):
     def test__sshkey_read(self):
-        """ SSHKeys.read() returns a single SSH key. """
+        """SSHKeys.read() returns a single SSH key."""
         SSHKey = make_origin().SSHKey
         key_id = random.randint(0, 100)
         key_dict = {"id": key_id, "key": make_string_without_spaces(), "keysource": ""}

setup.py

@@ -34,8 +34,10 @@ def read(filename):
         'Intended Audience :: System Administrators',
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Software Development :: Libraries',
     ],
     namespace_packages=['maas'],