From d5402cdce8c2b9001869839e78e8372df1f2324e Mon Sep 17 00:00:00 2001
From: Chris McCarthy <chris.mccarthy@methods.co.uk>
Date: Fri, 30 Jun 2023 10:24:59 +0100
Subject: [PATCH] #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.

---
 .azure/artifact-release-pipeline.yaml         | 32 ++-----------------
 .azure/azure-ci-build-pipeline.yaml           |  2 --
 pyproject.toml                                |  7 ++--
 .../training/training_config_main.yaml        |  2 +-
 4 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/.azure/artifact-release-pipeline.yaml b/.azure/artifact-release-pipeline.yaml
index ca8f5b60..47e9aacc 100644
--- a/.azure/artifact-release-pipeline.yaml
+++ b/.azure/artifact-release-pipeline.yaml
@@ -1,38 +1,12 @@
 trigger:
 - main
 
+pool:
+  vmImage: ubuntu-latest
 strategy:
   matrix:
-    Ubuntu2004Python38:
-      python.version: '3.8'
-      imageName: 'ubuntu-20.04'
-    Ubuntu2004Python39:
-      python.version: '3.9'
-      imageName: 'ubuntu-20.04'
-    Ubuntu2004Python310:
+    Python310:
       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:
 - task: UsePythonVersion@0
diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index 691f71e9..4c15daf5 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -16,8 +16,6 @@ strategy:
       python.version: '3.9'
     Python310:
       python.version: '3.10'
-    Python311:
-      python.version: '3.11'
 
 steps:
 - task: UsePythonVersion@0
diff --git a/pyproject.toml b/pyproject.toml
index 09b60777..41ed6516 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ name = "primaite"
 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"}]
 license = {text = "GFX"}
-requires-python = ">=3.8"
+requires-python = ">=3.8, <3.11"
 dynamic = ["version", "readme"]
 classifiers = [
     "License :: GFX",
@@ -20,7 +20,6 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
 ]
 
@@ -36,6 +35,7 @@ dependencies = [
     "PyYAML==6.0",
     "ray[rllib]==2.2.0",
     "stable-baselines3==1.6.2",
+    "tensorflow==2.12.0",
     "typer[all]==0.9.0"
 ]
 
@@ -65,9 +65,6 @@ dev = [
     "sphinx-copybutton==0.5.2",
     "wheel==0.38.4"
 ]
-tensorflow = [
-    "tensorflow==2.12.0",
-]
 
 [project.scripts]
 primaite = "primaite.cli:app"
diff --git a/src/primaite/config/_package_data/training/training_config_main.yaml b/src/primaite/config/_package_data/training/training_config_main.yaml
index cc5d4955..57793058 100644
--- a/src/primaite/config/_package_data/training/training_config_main.yaml
+++ b/src/primaite/config/_package_data/training/training_config_main.yaml
@@ -13,7 +13,7 @@ agent_framework: SB3
 # "TF" (Tensorflow)
 # TF2 (Tensorflow 2.X)
 # TORCH (PyTorch)
-deep_learning_framework: TORCH
+deep_learning_framework: TF2
 
 # Sets which Agent class will be used.
 # Options are: