fix python->python3 commands

Project/ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2018.4.24f1
+m_EditorVersion: 2018.4.22f1

.yamato/test_versions.metafile

-# List of editor versions for standalone-build-test and its dependencies.
+# List of configurations for standalone-build-test and its dependencies.
-test_editors:
-  - version: 2018.4
+# TODO either separate dictionary for platforms (type, image, flavor), or list the versions to test by platform.
+test_configs:
+  - name: Mac_2018.4
+    version: 2018.4
+    type: Unity::VM::osx
+    image: package-ci/mac:stable
+    flavor: b1.small
-  - version: 2019.4
-    csharp_backcompat_version: 1.0.0
-  - version: 2020.1
+ # - name: Mac_2019.4
+ #   version: 2019.4
+ #   type: Unity::VM::osx
+ #   image: package-ci/mac:stable
+ #   flavor: b1.small
+ #   csharp_backcompat_version: 1.0.0
+ # - name: Mac_2020.1
+ #   version: 2020.1
+ #   type: Unity::VM::osx
+ #   image: package-ci/mac:stable
+ #   flavor: b1.small
+ #   csharp_backcompat_version: 1.0.0
+ # - name: Mac_2020.2
+ #   version: 2020.2
+ #   type: Unity::VM::osx
+ #   image: package-ci/mac:stable
+ #   flavor: b1.small
+ #   # 2020.2 moved the AssetImporters namespace
+ #   # but we didn't handle this until 1.2.0
+ #   csharp_backcompat_version: 1.2.0
+
+ # TODO skip some tests on Windows based on their triggers.
+  - name: Win_2019.4
+    version: 2019.4
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.large
-  - version: 2020.2
-    # 2020.2 moved the AssetImporters namespace
-    # but we didn't handle this until 1.2.0
-    csharp_backcompat_version: 1.2.0

.yamato/standalone-build-test.yml

 {% metadata_file .yamato/test_versions.metafile %}
 ---
-{% for editor in test_editors %}
-test_mac_standalone_{{ editor.version }}:
-  name: Test Mac Standalone {{ editor.version }}
+{% for config in test_configs %}
+test_standalone_{{ config.name }}:
+  name: Test {{ config.name }} Standalone
-    type: Unity::VM::osx
-    image: ml-agents/ml-agents-bokken-mac:0.1.4-492264
-    flavor: i1.small
+    type: {{ config.type }}
+    image: {{ config.image }}
+    flavor: {{ config.flavor}}
-    UNITY_VERSION: {{ editor.version }}
+    UNITY_VERSION: {{ config.version }}
-    - pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade --user
-    - /Users/bokken/Library/Python/3.7/bin/unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/WallJump/Scenes/WallJump.unity
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/TestScenes/TestCompressedGrid/TestGridCompressed.unity
-    - python -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/TestScenes/TestCompressedTexture/TestTextureCompressed.unity
+    - 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 {{ config.version }} -c editor --wait --fast
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/Examples/WallJump/Scenes/WallJump.unity
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/TestScenes/TestCompressedGrid/TestGridCompressed.unity
+    - python3 -u -m ml-agents.tests.yamato.standalone_build_tests --scene=Assets/ML-Agents/TestScenes/TestCompressedTexture/TestTextureCompressed.unity
   triggers:
     cancel_old_ci: true
     expression: |

.yamato/training-int-tests.yml

 {% metadata_file .yamato/test_versions.metafile %}
 ---
-{% for editor in test_editors %}
-test_mac_training_int_{{ editor.version }}:
-  name: Test Mac Fast Training {{ editor.version }}
+{% for config in test_configs %}
+test_training_int_{{ config.name }}:
+  name: Test {{ config.name }} Fast Training
-    type: Unity::VM::osx
-    image: ml-agents/ml-agents-bokken-mac:0.1.4-492264
-    flavor: b1.small
+    type: {{ config.type }}
+    image: {{ config.image }}
+    flavor: {{ config.flavor}}
-    UNITY_VERSION: {{ editor.version }}
+    UNITY_VERSION: {{ config.version }}
-    - pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade --user
-    - /Users/bokken/Library/Python/3.7/bin/unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
-    - python -u -m ml-agents.tests.yamato.training_int_tests
+    - 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 {{ config.version }} -c editor --wait --fast
+    - python3 -u -m ml-agents.tests.yamato.training_int_tests
-    - python -u -m ml-agents.tests.yamato.training_int_tests --python=0.16.0
-    - python -u -m ml-agents.tests.yamato.training_int_tests --csharp={{ editor.csharp_backcompat_version }}
+    - python3 -u -m ml-agents.tests.yamato.training_int_tests --python=0.16.0
+    - python3 -u -m ml-agents.tests.yamato.training_int_tests --csharp={{ config.csharp_backcompat_version }}
-    - .yamato/standalone-build-test.yml#test_mac_standalone_{{ editor.version }}
+    - .yamato/standalone-build-test.yml#test_standalone_{{ config.name }}
   triggers:
     cancel_old_ci: true
     expression: |

ml-agents/tests/yamato/yamato_utils.py

         pip_commands += extra_packages
     for cmd in pip_commands:
         pip_index_url = "--index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple"
+        # TODO fix venv activate command for windows (or just don't run it)
-            f"source {venv_path}/bin/activate; python -m pip install -q {cmd} {pip_index_url}",
+            f"source {venv_path}/bin/activate; python3 -m pip install -q {cmd} {pip_index_url}",
             shell=True,
         )
     return venv_path