#917 - Added tensorflow to main deps for RLlib.

- Dropped support for Python 3.11 due to not supported on Ray RLlib.
- Made release pipeline only run once as we're now no longer using pure path wheels.
This commit is contained in:
Chris McCarthy
2023-06-30 10:24:59 +01:00
parent 7b1f889415
commit cf09202e96
4 changed files with 6 additions and 37 deletions

View File

@@ -1,38 +1,12 @@
trigger: trigger:
- main - main
pool:
vmImage: ubuntu-latest
strategy: strategy:
matrix: matrix:
Ubuntu2004Python38: Python310:
python.version: '3.8'
imageName: 'ubuntu-20.04'
Ubuntu2004Python39:
python.version: '3.9'
imageName: 'ubuntu-20.04'
Ubuntu2004Python310:
python.version: '3.10' python.version: '3.10'
imageName: 'ubuntu-20.04'
WindowsPython38:
python.version: '3.8'
imageName: 'windows-latest'
WindowsPython39:
python.version: '3.9'
imageName: 'windows-latest'
WindowsPython310:
python.version: '3.10'
imageName: 'windows-latest'
MacPython38:
python.version: '3.8'
imageName: 'macOS-latest'
MacPython39:
python.version: '3.9'
imageName: 'macOS-latest'
MacPython310:
python.version: '3.10'
imageName: 'macOS-latest'
pool:
vmImage: $(imageName)
steps: steps:
- task: UsePythonVersion@0 - task: UsePythonVersion@0

View File

@@ -16,8 +16,6 @@ strategy:
python.version: '3.9' python.version: '3.9'
Python310: Python310:
python.version: '3.10' python.version: '3.10'
Python311:
python.version: '3.11'
steps: steps:
- task: UsePythonVersion@0 - task: UsePythonVersion@0

View File

@@ -7,7 +7,7 @@ name = "primaite"
description = "PrimAITE (Primary-level AI Training Environment) is a simulation environment for training AI under the ARCD programme." description = "PrimAITE (Primary-level AI Training Environment) is a simulation environment for training AI under the ARCD programme."
authors = [{name="QinetiQ Training and Simulation Ltd"}] authors = [{name="QinetiQ Training and Simulation Ltd"}]
license = {text = "MIT License"} license = {text = "MIT License"}
requires-python = ">=3.8" requires-python = ">=3.8, <3.11"
dynamic = ["version", "readme"] dynamic = ["version", "readme"]
classifiers = [ classifiers = [
"License :: MIT License", "License :: MIT License",
@@ -20,7 +20,6 @@ classifiers = [
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3 :: Only",
] ]
@@ -36,6 +35,7 @@ dependencies = [
"PyYAML==6.0", "PyYAML==6.0",
"ray[rllib]==2.2.0", "ray[rllib]==2.2.0",
"stable-baselines3==1.6.2", "stable-baselines3==1.6.2",
"tensorflow==2.12.0",
"typer[all]==0.9.0" "typer[all]==0.9.0"
] ]
@@ -65,9 +65,6 @@ dev = [
"sphinx-copybutton==0.5.2", "sphinx-copybutton==0.5.2",
"wheel==0.38.4" "wheel==0.38.4"
] ]
tensorflow = [
"tensorflow==2.12.0",
]
[project.scripts] [project.scripts]
primaite = "primaite.cli:app" primaite = "primaite.cli:app"

View File

@@ -13,7 +13,7 @@ agent_framework: SB3
# "TF" (Tensorflow) # "TF" (Tensorflow)
# TF2 (Tensorflow 2.X) # TF2 (Tensorflow 2.X)
# TORCH (PyTorch) # TORCH (PyTorch)
deep_learning_framework: TORCH deep_learning_framework: TF2
# Sets which Agent class will be used. # Sets which Agent class will be used.
# Options are: # Options are: