Updating dependency versions and cleaning up setup.py

Author: vrdmr

setup.py

@@ -79,6 +79,64 @@
 """
 
 
+CLASSIFIERS = [
+    "Development Status :: 5 - Production/Stable",
+    'Programming Language :: Python',
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Operating System :: MacOS :: MacOS X",
+    "Environment :: Web Environment",
+    "License :: OSI Approved :: MIT License",
+    "Intended Audience :: Developers",
+]
+
+
+PACKAGES = [
+    "azure_functions_worker",
+    "azure_functions_worker.protos",
+    "azure_functions_worker.protos.identity",
+    "azure_functions_worker.protos.shared",
+    "azure_functions_worker.bindings",
+    "azure_functions_worker.bindings.shared_memory_data_transfer",
+    "azure_functions_worker.utils",
+    "azure_functions_worker._thirdparty"
+]
+
+
+INSTALL_REQUIRES = [
+    "grpcio~=1.43.0",
+    "grpcio-tools~=1.43.0",
+    "protobuf~=3.19.3",
+    "azure-functions==1.9.0"
+]
+
+
+EXTRA_REQUIRES = {
+    "dev": [
+        "azure-eventhub~=5.7.0",  # Used for EventHub E2E tests
+        "python-dateutil~=2.8.2",
+        "pycryptodome~=3.10.1",
+        "flake8~=4.0.1",
+        "mypy",
+        "pytest",
+        "requests==2.*",
+        "coverage",
+        "pytest-sugar",
+        "pytest-cov",
+        "pytest-xdist",
+        "pytest-randomly",
+        "pytest-instafail",
+        "pytest-rerunfailures",
+        "ptvsd"
+    ]
+}
+
+
 class BuildGRPC:
     """Generate gRPC bindings."""
     def _gen_grpc(self):
@@ -353,6 +411,12 @@ def run(self):
 with open("README.md") as readme:
     long_description = readme.read()
 
+COMMAND_CLASS = {
+    'develop': develop,
+    'build': build,
+    'webhost': webhost,
+    'extension': extension
+}
 
 setup(
     name='azure-functions-worker',
@@ -364,59 +428,12 @@ def run(self):
     url="https://github.com/Azure/azure-functions-python-worker",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: MIT License',
-        'Intended Audience :: Developers',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Operating System :: Microsoft :: Windows',
-        'Operating System :: POSIX',
-        'Operating System :: MacOS :: MacOS X',
-        'Environment :: Web Environment',
-    ],
+    classifiers=CLASSIFIERS,
     license='MIT',
-    packages=['azure_functions_worker',
-              'azure_functions_worker.protos',
-              'azure_functions_worker.protos.identity',
-              'azure_functions_worker.protos.shared',
-              'azure_functions_worker.bindings',
-              'azure_functions_worker.bindings.shared_memory_data_transfer',
-              'azure_functions_worker.utils',
-              'azure_functions_worker._thirdparty'],
-    install_requires=[
-        'grpcio~=1.33.2',
-        'grpcio-tools~=1.33.2',
-    ],
-    extras_require={
-        'dev': [
-            'azure-functions==1.8.0',
-            'azure-eventhub~=5.1.0',
-            'python-dateutil~=2.8.1',
-            'pycryptodome~=3.10.1',
-            'flake8~=3.7.9',
-            'mypy',
-            'pytest',
-            'requests==2.*',
-            'coverage',
-            'pytest-sugar',
-            'pytest-cov',
-            'pytest-xdist',
-            'pytest-randomly',
-            'pytest-instafail',
-            'pytest-rerunfailures',
-            'ptvsd'
-        ]
-    },
+    packages=PACKAGES,
+    install_requires=INSTALL_REQUIRES,
+    extras_require=EXTRA_REQUIRES,
     include_package_data=True,
-    cmdclass={
-        'develop': develop,
-        'build': build,
-        'webhost': webhost,
-        'extension': extension
-    },
+    cmdclass=COMMAND_CLASS,
     test_suite='tests'
 )

tests/endtoend/eventhub_batch_functions/metadata_output_batch/__init__.py

@@ -33,4 +33,4 @@ def main(req: func.HttpRequest):
     with client:
         client.send_batch(event_data_batch)
 
-    return f'OK'
+    return 'OK'

tests/endtoend/eventhub_functions/metadata_output/__init__.py

@@ -32,4 +32,4 @@ async def main(req: func.HttpRequest):
     finally:
         await client.close()
 
-    return f'OK'
+    return 'OK'

tests/unittests/resources/customer_func_path/common_module/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-__version__: str == 'function_app'
+__version__: str = 'function_app'
 
 import os
 # This module should be shadowed from customer_deps_path/common_module

tests/unittests/resources/customer_func_path/func_specific_module/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-__version__: str == 'function_app'
+__version__: str = 'function_app'
 
 import os
 # ./tests/unittests/resources/customer_func_path/func_specific_module

tests/unittests/test_dispatcher.py

@@ -63,14 +63,14 @@ async def test_dispatcher_initialize_worker_logging(self):
         async with self._ctrl as host:
             r = await host.init_worker('3.0.12345')
             self.assertEqual(
-                len([l for l in r.logs if l.message.startswith(
+                len([log for log in r.logs if log.message.startswith(
                     'Received WorkerInitRequest'
                 )]),
                 1
             )
 
             self.assertEqual(
-                len([l for l in r.logs if l.message.startswith(
+                len([log for log in r.logs if log.message.startswith(
                     'To enable debug level logging'
                 )]),
                 1
@@ -86,14 +86,14 @@ async def test_dispatcher_environment_reload_logging(self):
             # Reload environment variable on specialization
             r = await host.reload_environment(environment={})
             self.assertEqual(
-                len([l for l in r.logs if l.message.startswith(
+                len([log for log in r.logs if log.message.startswith(
                     'Received FunctionEnvironmentReloadRequest'
                 )]),
                 1
             )
 
             self.assertEqual(
-                len([l for l in r.logs if l.message.startswith(
+                len([log for log in r.logs if log.message.startswith(
                     'To enable debug level logging'
                 )]),
                 1