Merge branch 'og-develop' into franka_allegro

StanfordVL · Oct 17, 2023 · 6a1b415 · 6a1b415
2 parents e5ba3db + 9ed0308
commit 6a1b415
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/omnigibson/scenes/scene_base.py b/omnigibson/scenes/scene_base.py
@@ -31,7 +31,7 @@
 class Scene(Serializable, Registerable, Recreatable, ABC):
     """
     Base class for all Scene objects.
-    Contains the base functionalities for an arbitary scene with an arbitrary set of added objects
+    Contains the base functionalities for an arbitrary scene with an arbitrary set of added objects
     """
     def __init__(
             self,

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -28,7 +28,8 @@ echo -e "\nUsing [4m$conda_name[0m as the conda environment name\n"
 
 # Get Python version from Isaac Sim
 ISAAC_PYTHON_VERSION=$(${ISAAC_SIM_PATH}/python.sh -c "import platform; print(platform.python_version())")
-echo Using Python version [4m$ISAAC_PYTHON_VERSION[0m matching your current Isaac Sim version
+ISAAC_PYTHON_VERSION="${ISAAC_PYTHON_VERSION##*$'\n'}" # get rid of conda activation warnings
+echo Using Python version [4m$ISAAC_PYTHON_VERSION[0m matching your current Isaac Sim version
 
 # Create a conda environment with the appropriate python version
 source $(conda info --base)/etc/profile.d/conda.sh