3.7 support (#86)

Summary:
Pull Request resolved: #86

This adds python 3.7 support

Pull Request resolved: #85

Test Plan:
create a python 3.7 venv

```
python setup.py test
```

Reviewed By: tierex

Differential Revision: D29321212

Pulled By: kiukchung

fbshipit-source-id: 71ddaeefa1baa81841e90dc34158b5710969a891

Author: d4l3k

.github/workflows/python-unittests.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
     steps:
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2

dev-requirements.txt

@@ -16,3 +16,4 @@ flake8==3.9.0
 ts>=0.5.1
 torchserve>=0.4.0
 captum>=0.3.1
+importlib-metadata

setup.py

@@ -23,8 +23,8 @@ def get_version():
 
 
 if __name__ == "__main__":
-    if sys.version_info < (3, 8):
-        sys.exit("python >= 3.8 required for torchx-sdk")
+    if sys.version_info < (3, 7):
+        sys.exit("python >= 3.7 required for torchx-sdk")
 
     with open("README.md", encoding="utf8") as f:
         readme = f.read()
@@ -50,7 +50,7 @@ def get_version():
         url="https://github.com/pytorch/torchx",
         license="BSD-3",
         keywords=["pytorch", "machine learning"],
-        python_requires=">=3.8",
+        python_requires=">=3.7",
         install_requires=reqs.strip().split("\n"),
         include_package_data=True,
         packages=find_packages(exclude=("examples", "*.test", "aws*", "*.fb")),
@@ -63,6 +63,9 @@ def get_version():
         extras_require={
             "kfp": ["kfp==1.6.2"],
             "dev": dev_reqs,
+            ':python_version < "3.8"': [
+                "importlib-metadata",
+            ],
         },
         # PyPI package information.
         classifiers=[

torchx/components/base/test/lib_test.py

@@ -6,7 +6,12 @@
 # LICENSE file in the root directory of this source tree.
 
 import unittest
-from importlib import metadata
+
+try:
+    from importlib import metadata
+except ImportError:
+    import importlib_metadata as metadata
+
 from unittest.mock import patch
 
 from torchx.components.base import torch_dist_role

torchx/pipelines/kfp/adapter.py

@@ -9,7 +9,7 @@
 import os
 import os.path
 import shlex
-from typing import Protocol, Tuple, Optional, Mapping
+from typing import Tuple, Optional, Mapping
 
 import yaml
 from kfp import components, dsl
@@ -23,6 +23,7 @@
     V1EmptyDirVolumeSource,
 )
 from torchx.specs import api
+from typing_extensions import Protocol
 
 from .version import __version__ as __version__  # noqa F401
 
@@ -153,15 +154,18 @@ def factory_wrapper(*args: object, **kwargs: object) -> dsl.ContainerOp:
             c.output_artifact_paths["mlpipeline-ui-metadata"] = METADATA_FILE
             c.add_sidecar(_ui_metadata_sidecar(ui_metadata))
 
-        if (cpu := resources.cpu) >= 0:
+        cpu = resources.cpu
+        if cpu >= 0:
             cpu_str = f"{int(cpu*1000)}m"
             container.set_cpu_request(cpu_str)
             container.set_cpu_limit(cpu_str)
-        if (mem := resources.memMB) >= 0:
+        mem = resources.memMB
+        if mem >= 0:
             mem_str = f"{int(mem)}M"
             container.set_memory_request(mem_str)
             container.set_memory_limit(mem_str)
-        if (gpu := resources.gpu) > 0:
+        gpu = resources.gpu
+        if gpu > 0:
             container.set_gpu_limit(str(gpu))
 
         for name, port in role_spec.port_map.items():

torchx/runtime/plugins.py

@@ -76,7 +76,8 @@ def init_plugins_from_config(config: Dict[str, object]) -> None:
     """
     init_plugins_from_config imports all of the plugins listed in provided config.
     """
-    if plugins := config.get("plugins"):
+    plugins = config.get("plugins")
+    if plugins:
         if not isinstance(plugins, dict):
             raise TypeError(f"plugins must be a dict: {plugins}")
 

torchx/specs/file_linter.py

@@ -184,15 +184,14 @@ def _get_return_annotation(
         return_def = app_specs_func_def.returns
         if not return_def:
             return None
-        if type(return_def) == ast.Attribute:
-            return_def_attr = cast(ast.Attribute, return_def)
-            return return_def_attr.attr
-        elif type(return_def) == ast.Name:
-            return_def_name = cast(ast.Name, return_def)
-            return return_def_name.id
-        elif type(return_def) == ast.Constant:
-            return_def_constant = cast(ast.Constant, return_def)
-            return return_def_constant.value
+        if isinstance(return_def, ast.Attribute):
+            return return_def.attr
+        elif isinstance(return_def, ast.Name):
+            return return_def.id
+        elif isinstance(return_def, ast.Str):
+            return return_def.s
+        elif isinstance(return_def, ast.Constant):
+            return return_def.value
         else:
             return None
 

torchx/specs/test/file_linter_test.py

@@ -193,6 +193,7 @@ def test_validate_args_no_type_defs(self) -> None:
         linter_errors = validate(
             self._file_content, self._path, torchx_function="_test_args_no_type_defs"
         )
+        print(linter_errors)
         self.assertEqual(2, len(linter_errors))
         self.assertEqual(
             "Arg arg0 missing type annotation", linter_errors[0].description

torchx/util/entrypoints.py

@@ -5,8 +5,13 @@
 # LICENSE file in the root directory of this source tree.
 
 import warnings
-from importlib import metadata
-from importlib.metadata import EntryPoint
+
+try:
+    from importlib import metadata
+    from importlib.metadata import EntryPoint
+except ImportError:
+    import importlib_metadata as metadata
+    from importlib_metadata import EntryPoint
 from typing import Any, Dict, Optional
 
 

torchx/util/test/entrypoints_test.py

@@ -5,13 +5,35 @@
 # LICENSE file in the root directory of this source tree.
 
 import unittest
-from importlib.metadata import EntryPoint
+
+try:
+    from importlib.metadata import EntryPoint
+except ImportError:
+    from importlib_metadata import EntryPoint
+from configparser import ConfigParser
 from typing import Dict
+from typing import List
 from unittest.mock import MagicMock, patch
 
 from torchx.util.entrypoints import load, load_group
 
 
+def EntryPoint_from_config(config: ConfigParser) -> List[EntryPoint]:
+    # from stdlib, Copyright (c) Python Authors
+    return [
+        EntryPoint(name, value, group)
+        for group in config.sections()
+        for name, value in config.items(group)
+    ]
+
+
+def EntryPoint_from_text(text: str) -> List[EntryPoint]:
+    # from stdlib, Copyright (c) Python Authors
+    config = ConfigParser(delimiters="=")
+    config.read_string(text)
+    return EntryPoint_from_config(config)
+
+
 def foobar() -> str:
     return "foobar"
 
@@ -40,12 +62,11 @@ def barbaz() -> str:
 [ep.grp.missing.mod.test]
 baz = torchx.util.test.entrypoints_test.missing_module
 """
-_ENTRY_POINTS: Dict[str, EntryPoint] = {
-    # pyre-ignore[16]
-    "entrypoints.test": EntryPoint._from_text(_EP_TXT),
-    "ep.grp.test": EntryPoint._from_text(_EP_GRP_TXT),
-    "ep.grp.missing.attr.test": EntryPoint._from_text(_EP_GRP_IGN_ATTR_TXT),
-    "ep.grp.missing.mod.test": EntryPoint._from_text(_EP_GRP_IGN_MOD_TXT),
+_ENTRY_POINTS: Dict[str, List[EntryPoint]] = {
+    "entrypoints.test": EntryPoint_from_text(_EP_TXT),
+    "ep.grp.test": EntryPoint_from_text(_EP_GRP_TXT),
+    "ep.grp.missing.attr.test": EntryPoint_from_text(_EP_GRP_IGN_ATTR_TXT),
+    "ep.grp.missing.mod.test": EntryPoint_from_text(_EP_GRP_IGN_MOD_TXT),
 }
 
 _METADATA_EPS: str = "torchx.util.entrypoints.metadata.entry_points"