Skip to content

Commit b4cbaa6

Browse files
Miguel Alonso JrGitHub Enterprise
Miguel Alonso Jr
authored and
GitHub Enterprise
committed
Develop deprecate python 3.6 (#5)
* Dropped support for python 3.6 * Pinning python 3.9.9 for tests due to typing issues with 3.9.10 * Testing new bokken image. * Testing new bokken image. * Updated yamato standalone build test. * Updated yamato standalone build test. * Updated standalone build test. * Updated yamato configs to use mla bokken vm. * Bug fixes for yamato yml files. * Fixed com.unity.ml-agents-test.yml * Bumped min python version to 3.7.2 * Updated failing yamato jobs. * Updated github workflow for colab tests. * Updated github workflow for colab tests. * Updated github workflow for colab tests.
1 parent b388f51 commit b4cbaa6

25 files changed

+191
-182
lines changed

‎.github/workflows/colab.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Python
3131
uses: actions/setup-python@v2
3232
with:
33-
python-version: 3.8.x
33+
python-version: 3.9.9
3434
- uses: actions/setup-dotnet@v1
3535
with:
3636
dotnet-version: '6.0.x'

‎.github/workflows/pytest.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ jobs:
2424
# If one test in the matrix fails we still want to run the others.
2525
fail-fast: false
2626
matrix:
27-
# NOTE: 3.9.10 was failing but is hard to test since it JUST came out. Delaying debugging for now.
28-
# TODO: Set back to 3.9.x once we can test with 3.9.10 via pyenv.
29-
python-version: [3.6.x, 3.7.x, 3.8.x, 3.9.9]
27+
# pinning python 3.9.9 since there are typing issues with 3.9.10: https://github.com/Unity-Technologies/ml-agents/issues/5689
28+
python-version: [3.7.x, 3.8.x, 3.9.9]
3029
include:
31-
- python-version: 3.6.x
32-
pip_constraints: test_constraints_min_version.txt
3330
- python-version: 3.7.x
34-
pip_constraints: test_constraints_mid_version.txt
31+
pip_constraints: test_constraints_min_version.txt
3532
- python-version: 3.8.x
3633
pip_constraints: test_constraints_mid_version.txt
3734
- python-version: 3.9.9

‎.yamato/com.unity.ml-agents-coverage.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
1414
commands:
1515
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1616
- upm-ci project test -u {{ editor.version }} --type project-tests --project-path {{ editor.testProject }} --package-filter {{ package.name }} {{ coverageOptions }} --extra-utr-arg "reruncount=2"
17-
- python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ package.minCoveragePct }}
17+
- |
18+
conda activate python3.7
19+
python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ package.minCoveragePct }}
1820
artifacts:
1921
logs:
2022
paths:

‎.yamato/com.unity.ml-agents-optional-dep-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ OptionalDependencyTests_{{ optional_dep.name }}:
1515
name : Test Optional Package Dependencies {{ optional_dep.name }}
1616
agent:
1717
type: Unity::VM
18-
image: package-ci/ubuntu:stable
18+
image: ml-agents/ml-agents-ubuntu-18.04:latest
1919
flavor: b1.medium
2020
commands:
2121
- |

‎.yamato/com.unity.ml-agents-pack.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ pack:
22
name: Pack
33
agent:
44
type: Unity::VM
5-
image: package-ci/ubuntu:stable
5+
image: ml-agents/ml-agents-ubuntu-18.04:latest
66
flavor: b1.small
77
commands:
88
- |
9+
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
10+
conda activate python3.7
911
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1012
unity-downloader-cli -u 2020.3 -c editor --wait --fast
1113
./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -

‎.yamato/com.unity.ml-agents-test.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test_platforms:
2424
flavor: b1.small
2525
- name: linux
2626
type: Unity::VM
27-
image: package-ci/ubuntu:stable
27+
image: ml-agents/ml-agents-ubuntu-18.04:latest
2828
flavor: b1.medium
2929

3030
packages:
@@ -123,10 +123,14 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
123123
image: {{ platform.image }}
124124
flavor: {{ platform.flavor}}
125125
commands:
126-
- python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
127-
- unity-downloader-cli -u trunk -c editor --wait --fast
128-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
129-
- upm-ci project test -u {{ editor.version }} --project-path {{ editor.testProject }} --package-filter {{ package.name }} --extra-create-project-arg="-upmNoDefaultPackages" --extra-utr-arg "reruncount=2"
126+
- |
127+
{% if platform.name == "linux" %}
128+
conda activate python3.7
129+
{% endif %}
130+
python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
131+
unity-downloader-cli -u trunk -c editor --wait --fast
132+
npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
133+
upm-ci project test -u {{ editor.version }} --project-path {{ editor.testProject }} --package-filter {{ package.name }} --extra-create-project-arg="-upmNoDefaultPackages" --extra-utr-arg "reruncount=2"
130134
artifacts:
131135
logs:
132136
paths:

‎.yamato/compressed-sensor-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ test_compressed_obs_{{ editor.version }}:
55
name: Test Compressed Sensor Observation {{ editor.version }}
66
agent:
77
type: Unity::VM
8-
image: package-ci/ubuntu:stable
8+
image: ml-agents/ml-agents-ubuntu-18.04:latest
99
flavor: b1.medium
1010
variables:
1111
UNITY_VERSION: {{ editor.version }}
1212
commands:
1313
- |
14-
sudo apt-get update && sudo apt-get install -y python3-venv
15-
python3 -m venv venv && source venv/bin/activate
14+
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15+
conda activate python3.7
1616
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -u -m ml-agents.tests.yamato.setup_venv
1818
python ml-agents/tests/yamato/scripts/run_compressed_sensor.py --env=artifacts/testPlayer-TestGridCompressed

‎.yamato/coverage_tests.metafile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ coverage_test_editors:
55
coverage_test_platforms:
66
- name: linux
77
type: Unity::VM
8-
image: package-ci/ubuntu:stable
8+
image: ml-agents/ml-agents-ubuntu-18.04:latest
99
flavor: b1.medium
1010

1111
coverage_test_packages:

‎.yamato/gym-interface-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ test_gym_interface_{{ editor.version }}:
55
name: Test Linux Gym Interface {{ editor.version }}
66
agent:
77
type: Unity::VM
8-
image: package-ci/ubuntu:stable
8+
image: ml-agents/ml-agents-ubuntu-18.04:latest
99
flavor: b1.medium
1010
variables:
1111
UNITY_VERSION: {{ editor.version }}
1212
commands:
1313
- |
14-
sudo apt-get update && sudo apt-get install -y python3-venv
15-
python3 -m venv venv && source venv/bin/activate
14+
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15+
conda activate python3.7
1616
python -m pip install wheel --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1818
python -u -m ml-agents.tests.yamato.setup_venv

‎.yamato/protobuf-generation-test.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ test_linux_protobuf_generation:
22
name: Protobuf Generation Tests
33
agent:
44
type: Unity::VM
5-
image: package-ci/ubuntu:stable
5+
image: ml-agents/ml-agents-ubuntu-18.04:latest
66
flavor: b1.large
77
variables:
88
GRPC_VERSION: "1.14.1"
99
CS_PROTO_PATH: "com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects"
1010
commands:
1111
- |
12-
sudo apt-get update && sudo apt-get install -y python3-venv nuget
13-
python3 -m venv venv && source venv/bin/activate
12+
sudo apt-get update && sudo apt-get install -y nuget
13+
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
14+
conda activate python3.7
1415
nuget install Grpc.Tools -Version $GRPC_VERSION -OutputDirectory protobuf-definitions/
1516
python3 -m pip install --upgrade pip --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1617
python3 -m pip install grpcio==1.28.1 grpcio-tools==1.13.0 protobuf==3.11.3 six==1.14.0 mypy-protobuf==1.16.0 --progress-bar=off --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple

0 commit comments

Comments
 (0)