Revert "WIP: Experiment with environ.pop in lieu of getenv"

This reverts commit 6bcbdc8.

Author: stephane-caron

robot_descriptions/a1_description.py

@@ -6,16 +6,19 @@
 
 """A1 description."""
 
-from os import environ as _environ
-from os import path as _path
+import os
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "unitree_ros",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=(
+        os.environ.pop("ROBOT_DESCRIPTION_COMMIT")
+        if "ROBOT_DESCRIPTION_COMMIT" in os.environ
+        else None
+    ),
 )
 
-PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "robots", "a1_description")
+PACKAGE_PATH: str = os.path.join(REPOSITORY_PATH, "robots", "a1_description")
 
-URDF_PATH: str = _path.join(PACKAGE_PATH, "urdf", "a1.urdf")
+URDF_PATH: str = os.path.join(PACKAGE_PATH, "urdf", "a1.urdf")

robot_descriptions/a1_mj_description.py

@@ -6,14 +6,14 @@
 
 """A1 MJCF description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "unitree_mujoco",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "data", "a1")

robot_descriptions/aliengo_description.py

@@ -6,14 +6,14 @@
 
 """Aliengo description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "unitree_mujoco",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "data", "aliengo")

robot_descriptions/allegro_hand_description.py

@@ -6,14 +6,14 @@
 
 """Allegro Hand description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "drake",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(

robot_descriptions/allegro_hand_mj_description.py

@@ -5,14 +5,14 @@
 
 """Allegro Hand V3 MJCF description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "mujoco_menagerie",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "wonik_allegro")

robot_descriptions/aloha_mj_description.py

@@ -5,14 +5,14 @@
 
 """ALOHA 2 MJCF description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "mujoco_menagerie",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "aloha")

robot_descriptions/anymal_b_description.py

@@ -6,14 +6,14 @@
 
 """ANYmal B description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "anymal_b_simple_description",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH)

robot_descriptions/anymal_b_mj_description.py

@@ -6,14 +6,14 @@
 
 """ANYmal B MJCF description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "mujoco_menagerie",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "anybotics_anymal_b")

robot_descriptions/anymal_c_description.py

@@ -6,14 +6,14 @@
 
 """ANYmal C description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "anymal_c_simple_description",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH)

robot_descriptions/anymal_c_mj_description.py

@@ -6,14 +6,14 @@
 
 """ANYmal C MJCF description."""
 
-from os import environ as _environ
+from os import getenv as _getenv
 from os import path as _path
 
 from ._cache import clone_to_cache as _clone_to_cache
 
 REPOSITORY_PATH: str = _clone_to_cache(
     "mujoco_menagerie",
-    commit=_environ.pop("ROBOT_DESCRIPTION_COMMIT", None),
+    commit=_getenv("ROBOT_DESCRIPTION_COMMIT", None),
 )
 
 PACKAGE_PATH: str = _path.join(REPOSITORY_PATH, "anybotics_anymal_c")