Support Python3.10

facebookresearch · Apr 28, 2022 · b9544f1 · b9544f1
1 parent 6590a94
commit b9544f1
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -271,19 +271,19 @@ workflows:
       - test_macos:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
       - test_linux:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
       - test_win:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
       - test_linux_omc_dev:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
 
   plugin_tests:
@@ -292,17 +292,17 @@ workflows:
       - test_plugin_linux:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
               test_plugin: [<< pipeline.parameters.test_plugins >>]
       - test_plugin_macos:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
               test_plugin: [<< pipeline.parameters.test_plugins >>]
       - test_plugin_win:
           matrix:
             parameters:
-              py_version: ["3.6", "3.7", "3.8", "3.9"]
+              py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
               test_plugin: [<< pipeline.parameters.test_plugins >>]
 
 

diff --git a/examples/plugins/example_configsource_plugin/setup.py b/examples/plugins/example_configsource_plugin/setup.py
@@ -23,6 +23,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: OS Independent",
         ],
         install_requires=[

diff --git a/examples/plugins/example_generic_plugin/setup.py b/examples/plugins/example_generic_plugin/setup.py
@@ -23,6 +23,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: OS Independent",
         ],
         install_requires=[

diff --git a/examples/plugins/example_launcher_plugin/setup.py b/examples/plugins/example_launcher_plugin/setup.py
@@ -23,6 +23,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: OS Independent",
         ],
         install_requires=[

diff --git a/examples/plugins/example_registered_plugin/setup.py b/examples/plugins/example_registered_plugin/setup.py
@@ -23,6 +23,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: OS Independent",
     ],
     install_requires=[

diff --git a/examples/plugins/example_searchpath_plugin/setup.py b/examples/plugins/example_searchpath_plugin/setup.py
@@ -25,6 +25,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: OS Independent",
         ],
         install_requires=[

diff --git a/examples/plugins/example_sweeper_plugin/setup.py b/examples/plugins/example_sweeper_plugin/setup.py
@@ -23,6 +23,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: OS Independent",
         ],
         install_requires=[

diff --git a/hydra/_internal/utils.py b/hydra/_internal/utils.py
@@ -282,7 +282,7 @@ class FakeTracebackType:
                         assert iter_tb.tb_next is not None
                         iter_tb = iter_tb.tb_next
 
-                    print_exception(etype=None, value=ex, tb=final_tb)  # type: ignore
+                    print_exception(None, value=ex, tb=final_tb)  # type: ignore
                 sys.stderr.write(
                     "\nSet the environment variable HYDRA_FULL_ERROR=1 for a complete stack trace.\n"
                 )

diff --git a/hydra/core/plugins.py b/hydra/core/plugins.py
@@ -1,5 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import importlib
+import importlib.util
 import inspect
 import pkgutil
 import sys
@@ -181,10 +182,23 @@ def _scan_all_plugins(
                     if module_name.startswith("_") and not module_name.startswith("__"):
                         continue
                     import_time = timer()
-                    m = importer.find_module(modname)  # type: ignore
-                    assert m is not None
+
                     with warnings.catch_warnings(record=True) as recorded_warnings:
-                        loaded_mod = m.load_module(modname)
+                        if sys.version_info < (3, 10):
+                            m = importer.find_module(modname)  # type: ignore
+                            assert m is not None
+                            loaded_mod = m.load_module(modname)
+                        else:
+                            spec = importer.find_spec(modname)
+                            assert spec is not None
+                            if modname in sys.modules:
+                                loaded_mod = sys.modules[modname]
+                            else:
+                                loaded_mod = importlib.util.module_from_spec(spec)
+                            if loaded_mod is not None:
+                                spec.loader.exec_module(loaded_mod)
+                                sys.modules[modname] = loaded_mod
+
                     import_time = timer() - import_time
                     if len(recorded_warnings) > 0:
                         sys.stderr.write(

diff --git a/news/1856.feature b/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/noxfile.py b/noxfile.py
@@ -12,7 +12,7 @@
 
 BASE = os.path.abspath(os.path.dirname(__file__))
 
-DEFAULT_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
+DEFAULT_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"]
 DEFAULT_OS_NAMES = ["Linux", "MacOS", "Windows"]
 
 PYTHON_VERSIONS = os.environ.get(
@@ -546,6 +546,7 @@ def test_jupyter_notebooks(session):
     install_hydra(session, ["pip", "install", "-e"])
     args = pytest_args(
         "--nbval",
+        "-W ignore::DeprecationWarning",
         "-W ignore::ResourceWarning",
         "examples/jupyter_notebooks/compose_configs_in_notebook.ipynb",
     )
@@ -555,7 +556,12 @@ def test_jupyter_notebooks(session):
     for notebook in [
         file for file in notebooks_dir.iterdir() if str(file).endswith(".ipynb")
     ]:
-        args = pytest_args("--nbval", "-W ignore::ResourceWarning", str(notebook))
+        args = pytest_args(
+            "--nbval",
+            "-W ignore::DeprecationWarning",
+            "-W ignore::ResourceWarning",
+            str(notebook),
+        )
         args = [x for x in args if x != "-Werror"]
         session.run(*args, silent=SILENT)
 

diff --git a/plugins/hydra_ax_sweeper/news/1856.feature b/plugins/hydra_ax_sweeper/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_ax_sweeper/setup.py b/plugins/hydra_ax_sweeper/setup.py
@@ -20,6 +20,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS",
         "Development Status :: 4 - Beta",

diff --git a/plugins/hydra_colorlog/news/1856.feature b/plugins/hydra_colorlog/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_colorlog/setup.py b/plugins/hydra_colorlog/setup.py
@@ -21,6 +21,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: OS Independent",
     ],
     install_requires=["colorlog", "hydra-core>=1.0.0"],

diff --git a/plugins/hydra_joblib_launcher/news/1856.feature b/plugins/hydra_joblib_launcher/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_joblib_launcher/setup.py b/plugins/hydra_joblib_launcher/setup.py
@@ -20,6 +20,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: MacOS",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX :: Linux",

diff --git a/plugins/hydra_nevergrad_sweeper/news/1856.feature b/plugins/hydra_nevergrad_sweeper/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_nevergrad_sweeper/setup.py b/plugins/hydra_nevergrad_sweeper/setup.py
@@ -21,6 +21,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: OS Independent",
         "Development Status :: 4 - Beta",
     ],

diff --git a/plugins/hydra_optuna_sweeper/news/1856.feature b/plugins/hydra_optuna_sweeper/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_optuna_sweeper/setup.py b/plugins/hydra_optuna_sweeper/setup.py
@@ -21,6 +21,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS",
         "Development Status :: 4 - Beta",

diff --git a/plugins/hydra_rq_launcher/news/1856.feature b/plugins/hydra_rq_launcher/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_rq_launcher/setup.py b/plugins/hydra_rq_launcher/setup.py
@@ -21,6 +21,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: MacOS",
         "Operating System :: POSIX :: Linux",
     ],

diff --git a/plugins/hydra_submitit_launcher/news/1856.feature b/plugins/hydra_submitit_launcher/news/1856.feature
@@ -0,0 +1 @@
+Support for Python 3.10
diff --git a/plugins/hydra_submitit_launcher/setup.py b/plugins/hydra_submitit_launcher/setup.py
@@ -20,6 +20,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: MacOS",
         "Operating System :: POSIX :: Linux",
         "Development Status :: 4 - Beta",

diff --git a/setup.py b/setup.py
@@ -50,6 +50,7 @@
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Operating System :: POSIX :: Linux",
             "Operating System :: MacOS",
             "Operating System :: Microsoft :: Windows",