Removed 3.6 infrastructure (#1170)

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/python-3/.devcontainer/base.Dockerfile
 
-# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
+# [Choice] Python version: 3, 3.9, 3.8, 3.7
 ARG VARIANT="3.9"
 FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 		"dockerfile": "Dockerfile",
 		"context": "..",
 		"args": { 
-			// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
+			// Update 'VARIANT' to pick a Python version: 3, 3.7, 3.8, 3.9
 			"VARIANT": "3",
 			// Options
 			"NODE_VERSION": "lts/*"

azure-iot-device/azure/iot/device/common/async_adapter.py

@@ -5,10 +5,10 @@
 # --------------------------------------------------------------------------
 """This module contains tools for adapting sync code for use in async coroutines."""
 
+import asyncio
 import functools
 import logging
 import traceback
-import azure.iot.device.common.asyncio_compat as asyncio_compat
 
 logger = logging.getLogger(__name__)
 
@@ -25,7 +25,7 @@ def emulate_async(fn):
 
     @functools.wraps(fn)
     async def async_fn_wrapper(*args, **kwargs):
-        loop = asyncio_compat.get_running_loop()
+        loop = asyncio.get_running_loop()
 
         # Run fn in default ThreadPoolExecutor (CPU * 5 threads)
         return await loop.run_in_executor(None, functools.partial(fn, *args, **kwargs))
@@ -44,7 +44,7 @@ def __init__(self, return_arg_name=None):
         if return_arg_name and not isinstance(return_arg_name, str):
             raise TypeError("internal error: return_arg_name must be a string")
 
-        loop = asyncio_compat.get_running_loop()
+        loop = asyncio.get_running_loop()
         self.future = loop.create_future()
 
         def wrapping_callback(*args, **kwargs):

requirements_test.txt

@@ -1,6 +1,6 @@
-pytest < 8.0.0      # lazy_fixture currently broken in 8
+pytest < 8.0.0
+pytest-asyncio <= 0.16
 pytest-mock
-pytest-asyncio <= 0.16      # Can remove this once Python 3.6 support is dropped
 pytest-testdox>=1.1.1
 pytest-cov
 pytest-timeout

samples/async-edge-scenarios/README.md

@@ -4,17 +4,6 @@ This directory contains samples showing how to use the various features of Azure
 
 **Please note** that IoT Edge solutions are scoped to Linux containers and devices, documented [here](https://docs.microsoft.com/en-us/azure/iot-edge/tutorial-python-module#solution-scope). Please see [this blog post](https://techcommunity.microsoft.com/t5/internet-of-things/linux-modules-with-azure-iot-edge-on-windows-10-iot-enterprise/ba-p/1407066) to learn more about using Linux containers for IoT Edge on Windows devices. 
 
-**These samples are written to run in Python 3.7+**, but can be made to work with Python 3.6 with a slight modification as noted in each sample:
-
-```python
-if __name__ == "__main__":
-    asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()
-```
 
 In order to use these samples, they **must** be run from inside an Edge container.
 

samples/async-edge-scenarios/invoke_method_on_module.py

@@ -34,8 +34,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-edge-scenarios/send_message.py

@@ -37,8 +37,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-edge-scenarios/send_message_downstream.py

@@ -51,8 +51,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-edge-scenarios/send_message_to_output.py

@@ -38,8 +38,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-edge-scenarios/update_twin_reported_properties.py

@@ -27,8 +27,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/README.md

@@ -2,17 +2,6 @@
 
 This directory contains samples showing how to use the various features of Azure IoT Hub Device SDK with the Azure IoT Hub.
 
-**These samples are written to run in Python 3.7+**, but can be made to work with Python 3.6 with a slight modification as noted in each sample:
-
-```python
-if __name__ == "__main__":
-    asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()
-```
 
 ## Included Samples
 

samples/async-hub-scenarios/get_twin.py

@@ -27,8 +27,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/provision_symmetric_key.py

@@ -60,8 +60,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/provision_symmetric_key_group.py

@@ -131,8 +131,3 @@ async def register_device(registration_id):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/provision_symmetric_key_with_payload.py

@@ -70,8 +70,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/provision_x509.py

@@ -66,8 +66,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/receive_direct_method.py

@@ -64,8 +64,3 @@ def stdin_listener():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/receive_message.py

@@ -52,8 +52,3 @@ def stdin_listener():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/receive_message_x509.py

@@ -60,8 +60,3 @@ def stdin_listener():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/receive_twin_desired_properties_patch.py

@@ -47,8 +47,3 @@ def stdin_listener():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/send_message.py

@@ -43,8 +43,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/send_message_over_websockets.py

@@ -29,8 +29,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/send_message_via_module_x509.py

@@ -55,8 +55,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/send_message_via_proxy.py

@@ -49,8 +49,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/send_message_x509.py

@@ -53,8 +53,3 @@ async def send_test_message(i):
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/update_twin_reported_properties.py

@@ -28,8 +28,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/async-hub-scenarios/use_custom_sastoken.py

@@ -68,8 +68,3 @@ def stdin_listener():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/pnp/simple_thermostat.py

@@ -335,8 +335,3 @@ async def send_telemetry():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/pnp/temp_controller_with_thermostats.py

@@ -417,8 +417,3 @@ async def send_telemetry():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()

samples/simple_send_message.py

@@ -30,8 +30,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-
-    # If using Python 3.6 use the following code instead of asyncio.run(main()):
-    # loop = asyncio.get_event_loop()
-    # loop.run_until_complete(main())
-    # loop.close()