relaxing numpy dependency version and updating pybullet version (#2)

* relaxing numpy dependency version and updating pybullet version * bumping version in package.xml * updating docker and setting up dev requirements compatible with ros2 env
eaa3 · Feb 6, 2025 · 6cfdf7e · 6cfdf7e
1 parent 4c9cce1
commit 6cfdf7e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,5 @@ log/
 *.ddeb
 .pybuild
 _build
-.coverage
+.coverage
+gripx.egg-info
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -5,7 +5,7 @@
 ###########################################
 # Base image 
 ###########################################
-FROM nvidia/cuda:11.8.0-runtime-ubuntu22.04 AS base
+FROM nvidia/cuda:12.4.1-runtime-ubuntu22.04 AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -124,25 +124,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 ENV DEBIAN_FRONTEND=
 
-###########################################
-#  Full+Gazebo image 
-###########################################
-FROM full AS gazebo
-
-ENV DEBIAN_FRONTEND=noninteractive
-# Install gazebo
-RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg \
-  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null \
-  && apt-get update && apt-get install -q -y --no-install-recommends \
-  ros-humble-gazebo* \
-  && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=
-
-###########################################
-#  Full+Gazebo+Nvidia image 
-###########################################
-
-FROM gazebo AS gazebo-nvidia
+FROM full AS full-nvidia
 
 ################
 # Expose the nvidia driver to allow opengl 

diff --git a/grip/version.py b/grip/version.py
@@ -1 +1 @@
-__version__ = "0.0.9"
+__version__ = "0.0.10"
diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>grip</name>
-  <version>0.0.7</version>
+  <version>0.0.10</version>
   <description>grip is a library for Robot Grasp Learning Environments.</description>
   <maintainer email="[email protected]">Ermano Arruda</maintainer>
   <license>MIT</license>

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 numpy>=1.25.2,<=1.26.4 # numerical computing library
 scipy>=1.11.1 # scientific computation tools
-pybullet>=3.2.6 # physics engine used for simulation
+pybullet>=3.2.7 # physics engine used for simulation
 open3d>=0.10.0 # point cloud processing tools
 opencv-python>=4.9.0.80 # computer vision tools
 matplotlib>=3.3.4 # plotting tools

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,6 +1,6 @@
 numpy>=1.25.2,<=1.26.4 # numerical computing library
 scipy>=1.11.1 # scientific computation tools
-pybullet>=3.2.6 # physics engine used for simulation
+pybullet>=3.2.7 # physics engine used for simulation
 open3d>=0.10.0 # point cloud processing tools
 # opencv-python>=4.9.0.80 # computer vision tools
 matplotlib>=3.3.4 # plotting tools

diff --git a/setup.py b/setup.py
@@ -35,13 +35,12 @@
 
 core_requirements = [
     "setuptools<=65",
-    "numpy>=1.25.2,<=1.26.4",
+    "numpy>=1.26.4",
     "scipy>=1.11.1",
     "pybullet>=3.2.6",
     "open3d>=0.10.0",
     "opencv-python>=4.9.0.80",
     "matplotlib>=3.3.4",
-    # "ghalton==0.6.1",
     "pybullet-planning-eaa",
     "trimesh>=3.9.20",
     "xatlas>=0.0.7",