From ce779bc6fb788955c4670068938010f4a1ff66a6 Mon Sep 17 00:00:00 2001
From: Dominik Roth <dominik.roth.dev@gmail.com>
Date: Thu, 12 Oct 2023 14:55:00 +0200
Subject: [PATCH] Make mujoco (modern version) a required dependency

---
 pyproject.toml | 17 +++++++++--------
 setup.py       |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8a49117..2d2c8c2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,26 +25,27 @@ classifiers = [
     "Programming Language :: Python :: 3.11"
 ]
 
+dependencies = [
+    "mp_pytorch<=0.1.3",
+    "mujoco==2.3.3",
+    "gymnasium[mujoco]>0.26.0"
+]
+
 requires-python = ">=3.7"
 
 [project.urls]
-Homepage = "https://github.com/ALRhub/fancy_gym/"
+"Homepage" = "https://github.com/ALRhub/fancy_gym/"
+"Bug Tracker" = "https://github.com/ALRhub/fancy_gym/issues"
 
 [build-system]
-requires = ["setuptools>=51.0.0", "wheel"]
+requires = ["setuptools>=61.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
-project.dependencies = [
-    "gymnasium>=0.26.0",
-    "mp_pytorch<=0.1.3"
-]
-
 [project.optional-dependencies]
 dmc = ["shimmy[dm-control]", "Shimmy==1.0.0"]
 # PyPi does not allow external dependencies. Metaworld will have to be installed manually until Farama publishes up-to-date version of metaworld on PyPi.
 #metaworld = ["metaworld @ git+https://github.com/Farama-Foundation/Metaworld.git@d155d0051630bb365ea6a824e02c66c068947439#egg=metaworld"]
 box2d = ["gymnasium[box2d]>=0.26.0"]
-mujoco = ["mujoco==2.3.3", "gymnasium[mujoco]>0.26.0"]
 mujoco-legacy = ["mujoco-py>=2.1,<2.2", "cython<3"]
 jax = ["jax>=0.4.0", "jaxlib>=0.4.0"]
 
diff --git a/setup.py b/setup.py
index 24dda38..cf2397f 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,6 @@ extras = {
     'dmc': ['shimmy[dm-control]', 'Shimmy==1.0.0'],
     'metaworld': ['metaworld @ git+https://github.com/Farama-Foundation/Metaworld.git@d155d0051630bb365ea6a824e02c66c068947439#egg=metaworld'],
     'box2d': ['gymnasium[box2d]>=0.26.0'],
-    'mujoco': ['mujoco==2.3.3', 'gymnasium[mujoco]>0.26.0'],
     'mujoco-legacy': ['mujoco-py >=2.1,<2.2', 'cython<3'],
     'jax': ["jax >=0.4.0", "jaxlib >=0.4.0"],
 }
@@ -54,8 +53,9 @@ setup(
     ],
     extras_require=extras,
     install_requires=[
-        'gymnasium>=0.26.0',
         'mp_pytorch<=0.1.3'
+        'mujoco==2.3.3',
+        'gymnasium[mujoco]>0.26.0']
     ],
     packages=[package for package in find_packages(
     ) if package.startswith("fancy_gym")],