From 4f92ddbd56f5ce1ea93760aa6436d325acb871b8 Mon Sep 17 00:00:00 2001 From: Christopher Goy Date: Wed, 28 Apr 2021 15:19:49 -0700 Subject: [PATCH 1/4] Update version to 'pre.1' --- DevProject/Packages/packages-lock.json | 2 +- Project/Packages/packages-lock.json | 2 +- com.unity.ml-agents.extensions/package.json | 2 +- com.unity.ml-agents/CHANGELOG.md | 2 +- com.unity.ml-agents/Runtime/Academy.cs | 2 +- com.unity.ml-agents/package.json | 2 +- utils/validate_versions.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json index 6cfcb3bf16..9b0c10f5e9 100644 --- a/DevProject/Packages/packages-lock.json +++ b/DevProject/Packages/packages-lock.json @@ -65,7 +65,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.ml-agents": "2.0.0-exp.1", + "com.unity.ml-agents": "2.0.0-pre.1", "com.unity.modules.physics": "1.0.0" } }, diff --git a/Project/Packages/packages-lock.json b/Project/Packages/packages-lock.json index 4aa09eef39..880a44d01d 100644 --- a/Project/Packages/packages-lock.json +++ b/Project/Packages/packages-lock.json @@ -63,7 +63,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.ml-agents": "2.0.0-exp.1", + "com.unity.ml-agents": "2.0.0-pre.1", "com.unity.modules.physics": "1.0.0" } }, diff --git a/com.unity.ml-agents.extensions/package.json b/com.unity.ml-agents.extensions/package.json index ee6f5c368b..9748cc2236 100644 --- a/com.unity.ml-agents.extensions/package.json +++ b/com.unity.ml-agents.extensions/package.json @@ -5,7 +5,7 @@ "unity": "2019.4", "description": "A source-only package for new features based on ML-Agents", "dependencies": { - "com.unity.ml-agents": "2.0.0-exp.1", + "com.unity.ml-agents": "2.0.0-pre.1", "com.unity.modules.physics": "1.0.0" } } diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md index 515d33c9e2..84cbf4993e 100755 --- a/com.unity.ml-agents/CHANGELOG.md +++ b/com.unity.ml-agents/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.0.0-exp.1] - 2021-04-22 +## [2.0.0-pre.1] - 2021-04-22 ### Major Changes #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#) - The minimum supported Unity version was updated to 2019.4. (#5166) diff --git a/com.unity.ml-agents/Runtime/Academy.cs b/com.unity.ml-agents/Runtime/Academy.cs index b436041c89..bae806def8 100644 --- a/com.unity.ml-agents/Runtime/Academy.cs +++ b/com.unity.ml-agents/Runtime/Academy.cs @@ -107,7 +107,7 @@ public class Academy : IDisposable /// Unity package version of com.unity.ml-agents. /// This must match the version string in package.json and is checked in a unit test. /// - internal const string k_PackageVersion = "2.0.0-exp.1"; + internal const string k_PackageVersion = "2.0.0-pre.1"; const int k_EditorTrainingPort = 5004; diff --git a/com.unity.ml-agents/package.json b/com.unity.ml-agents/package.json index 1b0de93047..fd968a9d9c 100755 --- a/com.unity.ml-agents/package.json +++ b/com.unity.ml-agents/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.ml-agents", "displayName": "ML Agents", - "version": "2.0.0-exp.1", + "version": "2.0.0-pre.1", "unity": "2019.4", "description": "Use state-of-the-art machine learning to create intelligent character behaviors in any Unity environment (games, robotics, film, etc.).", "dependencies": { diff --git a/utils/validate_versions.py b/utils/validate_versions.py index ef4aa245ff..d0632d2f0e 100755 --- a/utils/validate_versions.py +++ b/utils/validate_versions.py @@ -85,7 +85,7 @@ def set_version( f.write(new_contents) if csharp_version is not None: - package_version = f"{csharp_version}-exp.1" + package_version = f"{csharp_version}-pre.1" if csharp_extensions_version is not None: # since this has never been promoted we need to keep # it in preview forever or CI will fail From 4feb64deff15f5f6a606b3f2f28cb92f2e158b2a Mon Sep 17 00:00:00 2001 From: Christopher Goy Date: Wed, 28 Apr 2021 17:03:17 -0700 Subject: [PATCH 2/4] Update to pre2 --- DevProject/Packages/packages-lock.json | 6 +++--- Project/Packages/packages-lock.json | 2 +- com.unity.ml-agents.extensions/package.json | 2 +- com.unity.ml-agents/Runtime/Academy.cs | 18 +++++++++--------- com.unity.ml-agents/package.json | 4 ++-- utils/validate_versions.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json index 9b0c10f5e9..e9685a8146 100644 --- a/DevProject/Packages/packages-lock.json +++ b/DevProject/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.barracuda": { - "version": "1.4.0-preview", + "version": "2.0.0-pre.2", "depth": 1, "source": "registry", "dependencies": { @@ -55,7 +55,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.barracuda": "1.4.0-preview", + "com.unity.barracuda": "2.0.0-pre.2", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } @@ -65,7 +65,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.ml-agents": "2.0.0-pre.1", + "com.unity.ml-agents": "2.0.0-pre.2", "com.unity.modules.physics": "1.0.0" } }, diff --git a/Project/Packages/packages-lock.json b/Project/Packages/packages-lock.json index 880a44d01d..c5ed79deae 100644 --- a/Project/Packages/packages-lock.json +++ b/Project/Packages/packages-lock.json @@ -63,7 +63,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.ml-agents": "2.0.0-pre.1", + "com.unity.ml-agents": "2.0.0-pre.2", "com.unity.modules.physics": "1.0.0" } }, diff --git a/com.unity.ml-agents.extensions/package.json b/com.unity.ml-agents.extensions/package.json index 9748cc2236..88b7510af9 100644 --- a/com.unity.ml-agents.extensions/package.json +++ b/com.unity.ml-agents.extensions/package.json @@ -5,7 +5,7 @@ "unity": "2019.4", "description": "A source-only package for new features based on ML-Agents", "dependencies": { - "com.unity.ml-agents": "2.0.0-pre.1", + "com.unity.ml-agents": "2.0.0-pre.2", "com.unity.modules.physics": "1.0.0" } } diff --git a/com.unity.ml-agents/Runtime/Academy.cs b/com.unity.ml-agents/Runtime/Academy.cs index bae806def8..939c3db8cd 100644 --- a/com.unity.ml-agents/Runtime/Academy.cs +++ b/com.unity.ml-agents/Runtime/Academy.cs @@ -107,7 +107,7 @@ public class Academy : IDisposable /// Unity package version of com.unity.ml-agents. /// This must match the version string in package.json and is checked in a unit test. /// - internal const string k_PackageVersion = "2.0.0-pre.1"; + internal const string k_PackageVersion = "2.0.0-pre.2"; const int k_EditorTrainingPort = 5004; @@ -301,7 +301,7 @@ void EnableAutomaticStepping() // This try-catch is because DontDestroyOnLoad cannot be used in Editor Tests GameObject.DontDestroyOnLoad(m_StepperObject); } - catch { } + catch {} } /// @@ -482,13 +482,13 @@ out var unityRlInitParameters void ResetActions() { - DecideAction = () => { }; - DestroyAction = () => { }; - AgentPreStep = i => { }; - AgentSendState = () => { }; - AgentAct = () => { }; - AgentForceReset = () => { }; - OnEnvironmentReset = () => { }; + DecideAction = () => {}; + DestroyAction = () => {}; + AgentPreStep = i => {}; + AgentSendState = () => {}; + AgentAct = () => {}; + AgentForceReset = () => {}; + OnEnvironmentReset = () => {}; } static void OnQuitCommandReceived() diff --git a/com.unity.ml-agents/package.json b/com.unity.ml-agents/package.json index fd968a9d9c..7ac37e70d2 100755 --- a/com.unity.ml-agents/package.json +++ b/com.unity.ml-agents/package.json @@ -1,11 +1,11 @@ { "name": "com.unity.ml-agents", "displayName": "ML Agents", - "version": "2.0.0-pre.1", + "version": "2.0.0-pre.2", "unity": "2019.4", "description": "Use state-of-the-art machine learning to create intelligent character behaviors in any Unity environment (games, robotics, film, etc.).", "dependencies": { - "com.unity.barracuda": "1.4.0-preview", + "com.unity.barracuda": "2.0.0-pre.2", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/utils/validate_versions.py b/utils/validate_versions.py index d0632d2f0e..480ee77daa 100755 --- a/utils/validate_versions.py +++ b/utils/validate_versions.py @@ -85,7 +85,7 @@ def set_version( f.write(new_contents) if csharp_version is not None: - package_version = f"{csharp_version}-pre.1" + package_version = f"{csharp_version}-pre.2" if csharp_extensions_version is not None: # since this has never been promoted we need to keep # it in preview forever or CI will fail From 63d20266b31f4599c0b1b8b722a42a4857128d40 Mon Sep 17 00:00:00 2001 From: Christopher Goy Date: Wed, 28 Apr 2021 17:04:06 -0700 Subject: [PATCH 3/4] Update changelog. --- com.unity.ml-agents/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md index 84cbf4993e..11c5338dd8 100755 --- a/com.unity.ml-agents/CHANGELOG.md +++ b/com.unity.ml-agents/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.0.0-pre.1] - 2021-04-22 +## [2.0.0-pre.2] - 2021-04-22 ### Major Changes #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#) - The minimum supported Unity version was updated to 2019.4. (#5166) From a8780e5ae38da42ee52225482baa381628d2db6f Mon Sep 17 00:00:00 2001 From: Christopher Goy Date: Wed, 28 Apr 2021 17:06:03 -0700 Subject: [PATCH 4/4] Format. --- com.unity.ml-agents/Runtime/Academy.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/com.unity.ml-agents/Runtime/Academy.cs b/com.unity.ml-agents/Runtime/Academy.cs index 939c3db8cd..0a1bcb0104 100644 --- a/com.unity.ml-agents/Runtime/Academy.cs +++ b/com.unity.ml-agents/Runtime/Academy.cs @@ -301,7 +301,7 @@ void EnableAutomaticStepping() // This try-catch is because DontDestroyOnLoad cannot be used in Editor Tests GameObject.DontDestroyOnLoad(m_StepperObject); } - catch {} + catch { } } /// @@ -482,13 +482,13 @@ out var unityRlInitParameters void ResetActions() { - DecideAction = () => {}; - DestroyAction = () => {}; - AgentPreStep = i => {}; - AgentSendState = () => {}; - AgentAct = () => {}; - AgentForceReset = () => {}; - OnEnvironmentReset = () => {}; + DecideAction = () => { }; + DestroyAction = () => { }; + AgentPreStep = i => { }; + AgentSendState = () => { }; + AgentAct = () => { }; + AgentForceReset = () => { }; + OnEnvironmentReset = () => { }; } static void OnQuitCommandReceived()