8000 Release 19 branch lts deprecation by miguelalonsojr · Pull Request #5673 · Unity-Technologies/ml-agents · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Release 19 branch lts deprecation #5673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/com.unity.ml-agents-optional-dep-tests.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
optional_deps:
- name: Analytics
project: "OptionalDepedencyTests/NoAnalyticsModule"
version: 2020.2
version: 2020.3
- name: Physics
project: OptionalDepedencyTests/NoPhysicsModule
version: 2020.2
version: 2020.3
- name: Physics2D
project: OptionalDepedencyTests/NoPhysics2DModule
version: 2020.2
version: 2020.3
---

{% for optional_dep in optional_deps %}
Expand Down
2 changes: 1 addition & 1 deletion .yamato/com.unity.ml-agents-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pack:
commands:
- |
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
unity-downloader-cli -u 2019.4 -c editor --wait --fast
unity-downloader-cli -u 2020.3 -c editor --wait --fast
./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -
npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
upm-ci project pack --project-path Project
Expand Down
4 changes: 2 additions & 2 deletions .yamato/com.unity.ml-agents-performance.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
test_editors:
- version: 2019.4
- version: 2020.2
- version: 2020.3
- version: 2021.2
---
{% for editor in test_editors %}
Run_Mac_Perfomance_Tests{{ editor.version }}:
Expand Down
4 changes: 2 additions & 2 deletions .yamato/com.unity.ml-agents-test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% metadata_file .yamato/coverage_tests.metafile %}
test_editors:
- version: 2019.4
- version: 2020.3
# We want some scene tests to run in the DevProject, but packages there only support 2020+
testProject: Project
enableNoDefaultPackages: !!bool true
- version: 2020.2
- version: 2020.3
testProject: DevProject
enableNoDefaultPackages: !!bool true
- version: 2021.2
Expand Down
2 changes: 1 addition & 1 deletion .yamato/coverage_tests.metafile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage_test_editors:
- version: 2020.2
- version: 2020.3
testProject: DevProject

coverage_test_platforms:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/standalone-build-webgl-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% capture editor_version %}2020.2{% endcapture %}
{% capture editor_version %}2020.3{% endcapture %}
test_webgl_standalone_{{ editor_version }}:
name: Test WebGL Standalone {{ editor_version }}
agent:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/test_versions.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# For each "other" test, we only run it against a single version of the
# editor to reduce the number of yamato jobs
test_editors:
- version: 2019.4
- version: 2020.3
extra_test: gym
- version: 2020.3
extra_test: sensor
Expand Down
4 changes: 2 additions & 2 deletions .yamato/training-backcompat-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

test_mac_backcompat_2019.4:
{% capture editor_version %}2019.4{% endcapture %}
test_mac_backcompat_2020.3:
{% capture editor_version %}2020.3{% endcapture %}
{% capture csharp_backcompat_version %}1.0.0{% endcapture %}
# This test has to run on mac because it requires the custom build of tensorflow without AVX
# Test against 2020.1 because 2020.2 has to run against package version 1.2.0
Expand Down
2 changes: 1 addition & 1 deletion Project/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.test-framework": "1.1.24",
"com.unity.test-framework": "1.1.29",
"com.unity.toolchain.macos-x86_64-linux-x86_64": "0.1.20-preview",
"com.unity.ugui": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
Expand Down
16 changes: 14 additions & 2 deletions Project/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"depth": 0,
"source": "local",
"dependencies": {
"com.unity.ml-agents": "2.1.0-exp.1",
"com.unity.ml-agents": "2.2.0",
"com.unity.modules.physics": "1.0.0"
}
},
Expand Down Expand Up @@ -93,7 +93,7 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.24",
"version": "1.1.29",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -163,6 +163,18 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions Project/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2019.4.25f1
m_EditorVersionWithRevision: 2019.4.25f1 (01a0494af254)
m_EditorVersion: 2020.3.25f1
m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)
2 changes: 1 addition & 1 deletion com.unity.ml-agents.extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "com.unity.ml-agents.extensions",
"displayName": "ML Agents Extensions",
"version": "0.6.0-preview",
"unity": "2019.4",
"unity": "2020.3",
"description": "A source-only package for new features based on ML-Agents",
"dependencies": {
"com.unity.ml-agents": "2.2.0",
Expand Down
1 change: 1 addition & 0 deletions com.unity.ml-agents/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to
### Major Changes

#### com.unity.ml-agents / com.unity.ml-agents.extensions (C#)
- The minimum supported Unity version was updated to 2020.3. (#5673)
- Added a new feature to replicate training areas dynamically during runtime. (#5568)
- Update Barracuda to 2.3.1-preview (#5591)
- Update Input System to 1.3.0 (#5661)
Expand Down
2 changes: 1 addition & 1 deletion com.unity.ml-agents/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "com.unity.ml-agents",
"displayName": "ML Agents",
"version": "2.2.0",
"unity": "2019.4",
"unity": "2020.3",
"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": "2.3.1-preview",
Expand Down
4 changes: 2 additions & 2 deletions docs/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The ML-Agents Toolkit contains several components:

Consequently, to install and use the ML-Agents Toolkit you will need to:

- Install Unity (2019.4 or later)
- Install Unity (2020.3 or later)
- Install Python (3.6.1 or higher)
- Clone this repository (Optional)
- __Note:__ If you do not clone the repository, then you will not be
Expand All @@ -38,7 +38,7 @@ Consequently, to install and use the ML-Agents Toolkit you will need to:
- Install the `com.unity.ml-agents.extensions` Unity package (Optional)
- Install the `mlagents` Python package

### Install **Unity 2019.4** or Later
### Install **Unity 2020.3** or Later

[Download](https://unity3d.com/get-unity/download) and install Unity. We
strongly recommend that you install Unity through the Unity Hub as it will
Expand Down
2 changes: 1 addition & 1 deletion docs/Migrating.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Migrating
## Migrating the package to version 2.0
- The official version of Unity ML-Agents supports is now 2019.4 LTS. If you run
- The official version of Unity ML-Agents supports is now 2020.3 LTS. If you run
into issues, please consider deleting your project's Library folder and reponening your
project.
- If you used any of the APIs that were deprecated before version 2.0, you need to use their replacement. These
Expand Down
2 changes: 1 addition & 1 deletion ml-agents/tests/yamato/yamato_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def run_standalone_build(
unity_exe = get_unity_executable_path()
print(f"Running BuildStandalonePlayer via {unity_exe}")

# enum values from https://docs.unity3d.com/2019.4/Documentation/ScriptReference/BuildTarget.html
# enum values from https://docs.unity3d.com/2020.3/Documentation/ScriptReference/BuildTarget.html
build_target_to_enum: Mapping[Optional[str], str] = {
"mac": "StandaloneOSX",
"osx": "StandaloneOSX",
Expand Down
0