#2869 - Pull in changes from 4.0.0a1-dev and resolve conflicts

2025-01-03 09:54:11 +00:00
parent 2108b914e3 491de6fc47
commit 55ddcb7eb4
402 changed files with 481 additions and 404 deletions
--- a/tests/e2e_integration_tests/init.py
+++ b/tests/e2e_integration_tests/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/action_masking/init.py
+++ b/tests/e2e_integration_tests/action_masking/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/action_masking/test_agents_use_action_masks.py
+++ b/tests/e2e_integration_tests/action_masking/test_agents_use_action_masks.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 from typing import Dict

 import pytest
--- a/tests/e2e_integration_tests/environments/init.py
+++ b/tests/e2e_integration_tests/environments/init.py
@@ -1 +1 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
--- a/tests/e2e_integration_tests/environments/test_rllib_multi_agent_environment.py
+++ b/tests/e2e_integration_tests/environments/test_rllib_multi_agent_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml
 from ray.rllib.algorithms.ppo import PPOConfig

--- a/tests/e2e_integration_tests/environments/test_rllib_single_agent_environment.py
+++ b/tests/e2e_integration_tests/environments/test_rllib_single_agent_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import tempfile
 from pathlib import Path

--- a/tests/e2e_integration_tests/environments/test_sb3_environment.py
+++ b/tests/e2e_integration_tests/environments/test_sb3_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 """Test that we can create a primaite environment and train sb3 agent with no crash."""
 import tempfile
 from pathlib import Path
--- a/tests/e2e_integration_tests/test_environment.py
+++ b/tests/e2e_integration_tests/test_environment.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import pydantic
 import pytest
 import yaml
--- a/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py
+++ b/tests/e2e_integration_tests/test_uc2_data_manipulation_scenario.py
@@ -1,4 +1,4 @@
-# © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+# © Crown-owned copyright 2025, Defence Science and Technology Laboratory UK
 import yaml

 from primaite.game.game import PrimaiteGame