Fix cattrs register calls for 3.9.10 (#17)

Author: Henry Peteet

.github/workflows/pytest.yml

@@ -23,14 +23,13 @@ jobs:
       # If one test in the matrix fails we still want to run the others.
       fail-fast: false
       matrix:
-        # pinning python 3.9.9 since there are typing issues with 3.9.10: https://github.com/Unity-Technologies/ml-agents/issues/5689
-        python-version: [3.7.x, 3.8.x, 3.9.9]
+        python-version: [3.7.x, 3.8.x, 3.9.x]
         include:
           - python-version: 3.7.x
             pip_constraints: test_constraints_min_version.txt
           - python-version: 3.8.x
             pip_constraints: test_constraints_mid_version.txt
-          - python-version: 3.9.9
+          - python-version: 3.9.x
             pip_constraints: test_constraints_max_version.txt
     steps:
     - uses: actions/checkout@v2

com.unity.ml-agents/CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to
 ### Minor Changes
 #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#)
 #### ml-agents / ml-agents-envs
+- Extended support to python 3.9.10
+
 ### Bug Fixes
 #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#)
 #### ml-agents / ml-agents-envs

ml-agents-envs/setup.py

@@ -59,7 +59,7 @@ def run(self):
         "numpy==1.21.2",
         "filelock>=3.4.0",
     ],
-    python_requires=">=3.7.2,<3.9.10",
+    python_requires=">=3.7.2,<3.10.0",
     # TODO: Remove this once mypy stops having spurious setuptools issues.
     cmdclass={"verify": VerifyVersionCommand},  # type: ignore
 )

ml-agents/mlagents/trainers/settings.py

@@ -664,8 +664,9 @@ def _set_default_hyperparameters(self):
     self_play: Optional[SelfPlaySettings] = None
     behavioral_cloning: Optional[BehavioralCloningSettings] = None
 
-    cattr.register_structure_hook(
-        Dict[RewardSignalType, RewardSignalSettings], RewardSignalSettings.structure
+    cattr.register_structure_hook_func(
+        lambda t: t == Dict[RewardSignalType, RewardSignalSettings],
+        RewardSignalSettings.structure,
     )
 
     @network_settings.validator
@@ -878,8 +879,9 @@ class RunOptions(ExportableSettings):
     cattr.register_structure_hook(EnvironmentSettings, strict_to_cls)
     cattr.register_structure_hook(EngineSettings, strict_to_cls)
     cattr.register_structure_hook(CheckpointSettings, strict_to_cls)
-    cattr.register_structure_hook(
-        Dict[str, EnvironmentParameterSettings], EnvironmentParameterSettings.structure
+    cattr.register_structure_hook_func(
+        lambda t: t == Dict[str, EnvironmentParameterSettings],
+        EnvironmentParameterSettings.structure,
     )
     cattr.register_structure_hook(Lesson, strict_to_cls)
     cattr.register_structure_hook(

ml-agents/setup.py

@@ -78,7 +78,7 @@ def run(self):
         'pypiwin32==223;platform_system=="Windows"',
         "importlib_metadata; python_version<'3.8'",
     ],
-    python_requires=">=3.7.2,<3.9.10",
+    python_requires=">=3.7.2,<3.10.0",
     entry_points={
         "console_scripts": [
             "mlagents-learn=mlagents.trainers.learn:main",