Drop Python 3.5 support from python-libjuju

Author: cderici

.github/workflows/tox.yaml

@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.5"
           - "3.6"
           - "3.7"
           - "3.8"
@@ -32,7 +31,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.5"
           - "3.6"
           - "3.7"
           - "3.8"

debian/control

@@ -33,14 +33,14 @@ Description:
     Requirements
     ------------
     .
-    * Python 3.5+
+    * Python 3.6+
     * Juju 2.0+
     .
     .
     Design Notes
     ------------
     .
-    * Asynchronous - uses asyncio and async/await features of python 3.5
+    * Asynchronous - Uses asyncio and async/await features of Python
     * Websocket-level bindings are programmatically generated (indirectly) from the
     Juju golang code, ensuring full api coverage
     * Provides an OO layer which encapsulates much of the websocket api and

docs/readme.rst

@@ -11,14 +11,14 @@ Documentation: https://pythonlibjuju.readthedocs.io/en/latest/
 Requirements
 ------------
 
-* Python 3.5+
+* Python 3.6+
 * Juju 2.0+
 
 
 Design Notes
 ------------
 
-* Asynchronous - uses asyncio and async/await features of python 3.5
+* Asynchronous - Uses asyncio and async/await features of Python
 * Websocket-level bindings are programmatically generated (indirectly) from the
   Juju golang code, ensuring full api coverage
 * Provides an OO layer which encapsulates much of the websocket api and

examples/add_machine.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3
 
 """
 This example:

examples/machine_hostname.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3
 
 """
 This example:

juju/model.py

@@ -2009,10 +2009,7 @@ async def add_local_resources(self, application, entity_url, metadata, resources
 
                 data = yaml.dump(docker_image_details)
 
-                if sys.version_info[0:2] == (3, 5):
-                    hash_alg = hashlib.sha384
-                else:
-                    hash_alg = hashlib.sha3_384
+                hash_alg = hashlib.sha3_384
 
                 charmresource['fingerprint'] = hash_alg(bytes(data, 'utf-8')).digest()
 

setup.py

@@ -57,7 +57,6 @@
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

tests/integration/test_connection.py

@@ -147,12 +147,6 @@ def __init__(self, destination):
         if hasattr(ssl, 'PROTOCOL_TLS_SERVER'):
             # python 3.6+
             protocol = ssl.PROTOCOL_TLS_SERVER
-        elif hasattr(ssl, 'PROTOCOL_TLS'):
-            # python 3.5.3+
-            protocol = ssl.PROTOCOL_TLS
-        else:
-            # python 3.5.2
-            protocol = ssl.PROTOCOL_TLSv1_2
         self.ssl_context = ssl.SSLContext(protocol)
         crt_file = Path(__file__).with_name('cert.pem')
         key_file = Path(__file__).with_name('key.pem')

tests/integration/test_unit.py

@@ -21,12 +21,7 @@ async def test_block_coroutine(event_loop):
         )
 
         async def is_leader_elected():
-            # TODO: cleanup/refactor the code below when the py3.5
-            # support is dropped
-            for u in app.units:
-                if await u.is_leader_from_status():
-                    return True
-            return False
+            return any([await u.is_leader_from_status() for u in app.units])
 
         await utils.block_until_with_coroutine(is_leader_elected,
                                                timeout=480)

tests/unit/test_bundle.py

@@ -1122,10 +1122,6 @@ async def __call__(self, *args, **kwargs):
 
         bundle = await handler._handle_local_charms(bundle, bundle_dir)
 
-        # TODO: for some reason 'assert_has_calls' is failing in
-        # Python3.5, refactor this with 'assert_has_calls' when
-        # Python3.5 support is dropped
-
         m1 = mock.call(
             "oci-image-charm",
             "charm_uri",