From 69b873ff09cd505788f00de218bf58c4f4ce36a5 Mon Sep 17 00:00:00 2001
From: Matteo Bettini <55539777+matteobettini@users.noreply.github.com>
Date: Fri, 26 Apr 2024 11:57:46 +0100
Subject: [PATCH] [Version] 1.2.0 (#80)

---
 benchmarl/__init__.py              | 2 +-
 docs/source/conf.py                | 4 ++--
 docs/source/usage/installation.rst | 4 ++--
 setup.py                           | 2 +-
 test/test_meltingpot.py            | 6 ------
 test/test_models.py                | 7 -------
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/benchmarl/__init__.py b/benchmarl/__init__.py
index 862122e3..826a1e98 100644
--- a/benchmarl/__init__.py
+++ b/benchmarl/__init__.py
@@ -5,7 +5,7 @@
 #
 
 
-__version__ = "1.1.1"
+__version__ = "1.2.0"
 
 import importlib
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7787b45c..4232fd7c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,8 +34,8 @@
     "python": ("https://docs.python.org/3/", None),
     "sphinx": ("https://www.sphinx-doc.org/en/master/", None),
     "torch": ("https://pytorch.org/docs/master", None),
-    "torchrl": ("https://pytorch.org/rl", None),
-    "tensordict": ("https://pytorch.org/tensordict", None),
+    "torchrl": ("https://pytorch.org/rl/stable/", None),
+    "tensordict": ("https://pytorch.org/tensordict/stable", None),
 }
 intersphinx_disabled_domains = ["std"]
 
diff --git a/docs/source/usage/installation.rst b/docs/source/usage/installation.rst
index 7499ec60..73644a05 100644
--- a/docs/source/usage/installation.rst
+++ b/docs/source/usage/installation.rst
@@ -17,7 +17,7 @@ For more details, or for installing nightly versions, see the
 Install BenchMARL
 -----------------
 
-You can just install it from github
+You can just install it from PyPi
 
 .. code-block:: console
 
@@ -48,7 +48,7 @@ You may want to install the following rendering and logging tools
 Install environments
 --------------------
 
-All enviornment dependencies are optional in BenchMARL and can be installed separately.
+All environment dependencies are optional in BenchMARL and can be installed separately.
 
 VMAS
 ^^^^
diff --git a/setup.py b/setup.py
index a218dbe2..219a4ce5 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def get_version():
     url="https://github.com/facebookresearch/BenchMARL",
     author="Matteo Bettini",
     author_email="mb2389@cl.cam.ac.uk",
-    install_requires=["torchrl>=0.3.1", "tqdm", "hydra-core"],
+    install_requires=["torchrl==0.4.0", "tqdm", "hydra-core"],
     extras_require={
         "vmas": ["vmas>=1.3.4"],
         "pettingzoo": ["pettingzoo[all]>=1.24.3"],
diff --git a/test/test_meltingpot.py b/test/test_meltingpot.py
index f86a8b99..db6a5474 100644
--- a/test/test_meltingpot.py
+++ b/test/test_meltingpot.py
@@ -5,9 +5,7 @@
 #
 
 
-import packaging
 import pytest
-import torchrl
 
 from benchmarl.algorithms import (
     algorithm_config_registry,
@@ -35,10 +33,6 @@ def _get_unique_envs(names):
 
 
 @pytest.mark.skipif(not _has_meltingpot, reason="Meltingpot not found")
-@pytest.mark.skipif(
-    packaging.version.parse(torchrl.__version__).base_version <= "0.3.1",
-    reason="TorchRL <= 0.3.1 does nto support meltingpot",
-)
 class TestMeltingPot:
     @pytest.mark.parametrize("algo_config", algorithm_config_registry.values())
     @pytest.mark.parametrize("task", [MeltingPotTask.COMMONS_HARVEST__OPEN])
diff --git a/test/test_models.py b/test/test_models.py
index 8867b05a..5b28e3b8 100644
--- a/test/test_models.py
+++ b/test/test_models.py
@@ -6,10 +6,8 @@
 
 from typing import List
 
-import packaging
 import pytest
 import torch
-import torchrl
 
 from benchmarl.hydra_config import load_model_config_from_hydra
 from benchmarl.models import model_config_registry
@@ -79,11 +77,6 @@ def test_models_forward_shape(
         pytest.skip()  # this combination should never happen
     if ("gnn" in model_name) and centralised:
         pytest.skip("gnn model is always decentralized")
-    if (
-        packaging.version.parse(torchrl.__version__).base_version <= "0.3.1"
-        and "cnn" in model_name
-    ):
-        pytest.skip("TorchRL <= 0.3.1 does not support MultiAgentCNN")
 
     torch.manual_seed(0)