diff --git a/.github/unittest/install_pettingzoo.sh b/.github/unittest/install_pettingzoo.sh index 0ef1f506..41269e9d 100644 --- a/.github/unittest/install_pettingzoo.sh +++ b/.github/unittest/install_pettingzoo.sh @@ -1,4 +1,4 @@ -pip install "pettingzoo[all]==1.24.1" +pip install "pettingzoo[all]==1.24.3" sudo apt-get update sudo apt-get install python3-opengl xvfb diff --git a/setup.py b/setup.py index d934db53..4bb76aae 100644 --- a/setup.py +++ b/setup.py @@ -27,15 +27,15 @@ def package_files(directory): setup( name="benchmarl", - version="1.0.0", + version="1.1.0", description="BenchMARL", url="https://github.com/facebookresearch/BenchMARL", author="Matteo Bettini", author_email="mb2389@cl.cam.ac.uk", - install_requires=["torchrl>=0.2.0", "tqdm", "hydra-core"], + install_requires=["torchrl>=0.3.0", "tqdm", "hydra-core"], extras_require={ "vmas": ["vmas>=1.3.4"], - "pettingzoo": ["pettingzoo[all]>=1.24.1"], + "pettingzoo": ["pettingzoo[all]>=1.24.3"], "gnn": ["torch_geometric"], }, packages=find_packages(), diff --git a/test/test_pettingzoo.py b/test/test_pettingzoo.py index 7d86a37d..a96ed56b 100644 --- a/test/test_pettingzoo.py +++ b/test/test_pettingzoo.py @@ -43,7 +43,7 @@ def test_all_algos( if (prefer_continuous and not algo_config.supports_continuous_actions()) or ( not prefer_continuous and not algo_config.supports_discrete_actions() ): - return + pytest.skip() # To not run unsupported algo-task pairs if ( @@ -53,7 +53,7 @@ def test_all_algos( not task.supports_discrete_actions() and not algo_config.supports_continuous_actions() ): - return + pytest.skip() task = task.get_from_yaml() experiment_config.prefer_continuous_actions = prefer_continuous @@ -119,7 +119,7 @@ def test_reloading_trainer( experiment_config.prefer_continuous_actions = prefer_continuous algo_config = algo_config.get_from_yaml() if isinstance(algo_config, VdnConfig): - # There are some bugs currently in TorchRL + # There are some bugs currently in TorchRL https://github.com/pytorch/rl/issues/1593 return ExperimentUtils.check_experiment_loading( algo_config=algo_config, diff --git a/test/test_vmas.py b/test/test_vmas.py index b88534cb..1204ea6c 100644 --- a/test/test_vmas.py +++ b/test/test_vmas.py @@ -43,7 +43,7 @@ def test_all_algos( if (prefer_continuous and not algo_config.supports_continuous_actions()) or ( not prefer_continuous and not algo_config.supports_discrete_actions() ): - return + pytest.skip() task = task.get_from_yaml() experiment_config.prefer_continuous_actions = prefer_continuous @@ -108,7 +108,7 @@ def test_reloading_trainer( ): algo_config = algo_config.get_from_yaml() if isinstance(algo_config, VdnConfig): - # There are some bugs currently in TorchRL + # There are some bugs currently in TorchRL https://github.com/pytorch/rl/issues/1593 return ExperimentUtils.check_experiment_loading( algo_config=algo_config,