From f2754e19011a6ef329a40efc92dfa4bad81a22d3 Mon Sep 17 00:00:00 2001 From: Kallinteris Andreas <30759571+Kallinteris-Andreas@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:38:54 +0200 Subject: [PATCH 01/11] Update pyproject.toml pytrhon version to 3.8 (#191) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2a5aea19..ecaf5295 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -106,7 +106,7 @@ exclude = [ strict = [] typeCheckingMode = "basic" -pythonVersion = "3.7" +pythonVersion = "3.8" pythonPlatform = "All" typeshedPath = "typeshed" enableTypeIgnoreComments = true From 2686388cc978d20cef9ede258cb3d7bcd91b294a Mon Sep 17 00:00:00 2001 From: Daniel CH Tan Date: Mon, 11 Dec 2023 21:29:49 +0000 Subject: [PATCH 02/11] Register PointMaze_Open_Diverse_GR --- gymnasium_robotics/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gymnasium_robotics/__init__.py b/gymnasium_robotics/__init__.py index 05a68223..18bd806d 100644 --- a/gymnasium_robotics/__init__.py +++ b/gymnasium_robotics/__init__.py @@ -1111,6 +1111,18 @@ def _merge(a, b): max_episode_steps=300, ) + register( + id=f"PointMaze_Open_Diverse_GR{suffix}-v3", + entry_point="gymnasium_robotics.envs.maze.point_maze:PointMazeEnv", + kwargs=_merge( + { + "maze_map": maps.OPEN_DIVERSE_GR, + }, + kwargs, + ), + max_episode_steps=300, + ) + register( id=f"PointMaze_Medium{suffix}-v3", entry_point="gymnasium_robotics.envs.maze.point_maze:PointMazeEnv", From f822c402fd144a8a6ce6da696d6b4355348746b1 Mon Sep 17 00:00:00 2001 From: Seth Pate Date: Thu, 21 Dec 2023 16:43:38 -0500 Subject: [PATCH 03/11] update observation space docstring: obs[6:8] is actually block - gripper --- gymnasium_robotics/envs/fetch/pick_and_place.py | 6 +++--- gymnasium_robotics/envs/fetch/push.py | 6 +++--- gymnasium_robotics/envs/fetch/slide.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gymnasium_robotics/envs/fetch/pick_and_place.py b/gymnasium_robotics/envs/fetch/pick_and_place.py index f975c361..b6d0673c 100644 --- a/gymnasium_robotics/envs/fetch/pick_and_place.py +++ b/gymnasium_robotics/envs/fetch/pick_and_place.py @@ -45,9 +45,9 @@ class MujocoFetchPickAndPlaceEnv(MujocoFetchEnv, EzPickle): | 3 | Block x position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 4 | Block y position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 5 | Block z position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | - | 6 | Relative block x position with respect to gripper x position in globla coordinates. Equals to xgripper - xblock | -Inf | Inf | object0 |- |- | position (m) | - | 7 | Relative block y position with respect to gripper y position in globla coordinates. Equals to ygripper - yblock | -Inf | Inf | object0 |- |- | position (m) | - | 8 | Relative block z position with respect to gripper z position in globla coordinates. Equals to zgripper - zblock | -Inf | Inf | object0 |- |- | position (m) | + | 6 | Relative block x position with respect to gripper x position in global coordinates. Equals to xblock - xgripper | -Inf | Inf | object0 |- |- | position (m) | + | 7 | Relative block y position with respect to gripper y position in global coordinates. Equals to yblock - ygripper | -Inf | Inf | object0 |- |- | position (m) | + | 8 | Relative block z position with respect to gripper z position in global coordinates. Equals to zblock - zgripper | -Inf | Inf | object0 |- |- | position (m) | | 9 | Joint displacement of the right gripper finger | -Inf | Inf |- | robot0:r_gripper_finger_joint | hinge | position (m) | | 10 | Joint displacement of the left gripper finger | -Inf | Inf |- | robot0:l_gripper_finger_joint | hinge | position (m) | | 11 | Global x rotation of the block in a XYZ Euler frame rotation | -Inf | Inf | object0 |- |- | angle (rad) | diff --git a/gymnasium_robotics/envs/fetch/push.py b/gymnasium_robotics/envs/fetch/push.py index 707f850e..57545ac9 100644 --- a/gymnasium_robotics/envs/fetch/push.py +++ b/gymnasium_robotics/envs/fetch/push.py @@ -73,9 +73,9 @@ class MujocoFetchPushEnv(MujocoFetchEnv, EzPickle): | 3 | Block x position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 4 | Block y position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 5 | Block z position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | - | 6 | Relative block x position with respect to gripper x position in globla coordinates. Equals to xgripper - xblock | -Inf | Inf | object0 |- |- | position (m) | - | 7 | Relative block y position with respect to gripper y position in globla coordinates. Equals to ygripper - yblock | -Inf | Inf | object0 |- |- | position (m) | - | 8 | Relative block z position with respect to gripper z position in globla coordinates. Equals to zgripper - zblock | -Inf | Inf | object0 |- |- | position (m) | + | 6 | Relative block x position with respect to gripper x position in global coordinates. Equals to xblock - xgripper | -Inf | Inf | object0 |- |- | position (m) | + | 7 | Relative block y position with respect to gripper y position in global coordinates. Equals to yblock - ygripper | -Inf | Inf | object0 |- |- | position (m) | + | 8 | Relative block z position with respect to gripper z position in global coordinates. Equals to zblock - zgripper | -Inf | Inf | object0 |- |- | position (m) | | 9 | Joint displacement of the right gripper finger | -Inf | Inf |- | robot0:r_gripper_finger_joint | hinge | position (m) | | 10 | Joint displacement of the left gripper finger | -Inf | Inf |- | robot0:l_gripper_finger_joint | hinge | position (m) | | 11 | Global x rotation of the block in a XYZ Euler frame rotation | -Inf | Inf | object0 |- |- | angle (rad) | diff --git a/gymnasium_robotics/envs/fetch/slide.py b/gymnasium_robotics/envs/fetch/slide.py index 2417f614..bc0dbf4e 100644 --- a/gymnasium_robotics/envs/fetch/slide.py +++ b/gymnasium_robotics/envs/fetch/slide.py @@ -74,9 +74,9 @@ class MujocoFetchSlideEnv(MujocoFetchEnv, EzPickle): | 3 | Puck x position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 4 | Puck y position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | | 5 | Puck z position in global coordinates | -Inf | Inf | object0 |- |- | position (m) | - | 6 | Relative puck x position with respect to gripper x position in globla coordinates. Equals to xgripper - xpuck | -Inf | Inf | object0 |- |- | position (m) | - | 7 | Relative puck y position with respect to gripper y position in globla coordinates. Equals to ygripper - ypuck | -Inf | Inf | object0 |- |- | position (m) | - | 8 | Relative puck z position with respect to gripper z position in globla coordinates. Equals to zgripper - zpuck | -Inf | Inf | object0 |- |- | position (m) | + | 6 | Relative puck x position with respect to gripper x position in global coordinates. Equals to xpuck - xgripper | -Inf | Inf | object0 |- |- | position (m) | + | 7 | Relative puck y position with respect to gripper y position in global coordinates. Equals to ypuck - ygripper | -Inf | Inf | object0 |- |- | position (m) | + | 8 | Relative puck z position with respect to gripper z position in global coordinates. Equals to zpuck - zgripper | -Inf | Inf | object0 |- |- | position (m) | | 9 | Joint displacement of the right gripper finger | -Inf | Inf |- | robot0:r_gripper_finger_joint | hinge | position (m) | | 10 | Joint displacement of the left gripper finger | -Inf | Inf |- | robot0:l_gripper_finger_joint | hinge | position (m) | | 11 | Global x rotation of the puck in a XYZ Euler frame rotation | -Inf | Inf | object0 |- |- | angle (rad) | From 4c5e58961156d4c7873f734374645bf8a376eb73 Mon Sep 17 00:00:00 2001 From: Kallinteris Andreas <30759571+Kallinteris-Andreas@users.noreply.github.com> Date: Sat, 23 Dec 2023 14:41:02 +0200 Subject: [PATCH 04/11] Update to `pyright==1.1.339` (#200) * update pyright in pre-commit.yaml * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ebaea8c..aee1d937 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: language: node pass_filenames: false types: [python] - additional_dependencies: ["pyright"] + additional_dependencies: ["pyright@1.1.339"] args: - --project=pyproject.toml - repo: https://github.com/pycqa/pydocstyle From e0f40d0ad4520765f3a1ed8cef37dc16c0cdcfc1 Mon Sep 17 00:00:00 2001 From: Kallinteris Andreas <30759571+Kallinteris-Andreas@users.noreply.github.com> Date: Sat, 23 Dec 2023 15:49:39 +0200 Subject: [PATCH 05/11] remove py3.7 from `installation.md` documentation (#199) --- docs/content/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/installation.md b/docs/content/installation.md index caea3214..d2079bfd 100644 --- a/docs/content/installation.md +++ b/docs/content/installation.md @@ -11,4 +11,4 @@ These environments also require the MuJoCo engine from Deepmind to be installed. Note that the latest environment versions use the latest mujoco python bindings maintained by the MuJoCo team. If you wish to use the old versions of the environments that depend on [mujoco-py](https://github.com/openai/mujoco-py), please install this library with `pip install gymnasium-robotics[mujoco-py]` -We support and test for Python 3.7, 3.8, 3.9, 3.10 and 3.11 on Linux and macOS. We will accept PRs related to Windows, but do not officially support it. \ No newline at end of file +We support and test for Python 3.8, 3.9, 3.10 and 3.11 on Linux and macOS. We will accept PRs related to Windows, but do not officially support it. From ae9fe752fe1d8014964f5798702ddc24e2a1180d Mon Sep 17 00:00:00 2001 From: Kallinteris Andreas <30759571+Kallinteris-Andreas@users.noreply.github.com> Date: Sun, 24 Dec 2023 11:28:51 +0200 Subject: [PATCH 06/11] Update PULL_REQUEST_TEMPLATE.md (#198) --- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 996c690e..d6b72caf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,12 +8,14 @@ Fixes # (issue) Please delete options that are not relevant. +- [ ] Documentation only change (no code changed) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Screenshots + Please attach before and after screenshots of the change if applicable.