From 0d2d4ecd5a3e1a0a4fe287c83253e6463a21e381 Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Thu, 22 Aug 2024 17:21:02 -0400 Subject: [PATCH 1/9] Update numpy pin to latest 1.x release --- body/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/body/setup.py b/body/setup.py index 01bce9e2..382f1c33 100644 --- a/body/setup.py +++ b/body/setup.py @@ -19,7 +19,7 @@ "Operating System :: OS Independent", "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)" ], - install_requires=['numpy<=1.23.2', 'scipy', 'matplotlib<=3.5.0', 'ipython', 'pandas', 'sympy', 'nose', + install_requires=['numpy<=1.26.4', 'scipy', 'matplotlib<=3.5.0', 'ipython', 'pandas', 'sympy', 'nose', 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'colorama', 'filelock', 'scikit-image', 'open3d', 'pyrealsense2', 'pathlib', 'psutil', 'gitpython', 'urchin', 'urdf_parser_py', # urdfpy ==> urchin From ceff3e9808f74b3705b11e77a143e28493aa3bff Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Thu, 22 Aug 2024 17:22:13 -0400 Subject: [PATCH 2/9] Unpin trimesh --- tools/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/setup.py b/tools/setup.py index fd5aae06..6cfb44bc 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -25,11 +25,11 @@ "Operating System :: OS Independent", "License :: OSI Approved :: Apache Software License" ], - install_requires=['numpy==1.23.2', 'scipy', 'matplotlib==3.5.0', 'ipython', 'pandas', 'sympy', 'nose', 'sh', 'packaging', + install_requires=['numpy==1.26.4', 'scipy', 'matplotlib==3.5.0', 'ipython', 'pandas', 'sympy', 'nose', 'sh', 'packaging', 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'opencv-contrib-python', 'colorama', 'scikit-image', 'open3d', 'pyrealsense2', 'gitpython', 'xmltodict', 'filelock', 'pyaudio', - 'pyglet == 1.4.10; python_version < "3.0"', 'trimesh==3.6.38', 'urchin', # urdfpy ==> urchin + 'pyglet == 1.4.10; python_version < "3.0"', 'trimesh', 'urchin', # urdfpy ==> urchin 'pyyaml>=5.1', # required for yaml.FullLoader 'hello-robot-stretch-body>=0.7.1'] ) From aa29e21bb4e9c7600d2d72dce21d820bea02719b Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 12:57:49 -0400 Subject: [PATCH 3/9] Remove matplotlib pin --- body/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/body/setup.py b/body/setup.py index 382f1c33..5e56997b 100644 --- a/body/setup.py +++ b/body/setup.py @@ -19,7 +19,7 @@ "Operating System :: OS Independent", "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)" ], - install_requires=['numpy<=1.26.4', 'scipy', 'matplotlib<=3.5.0', 'ipython', 'pandas', 'sympy', 'nose', + install_requires=['numpy<=1.26.4', 'scipy', 'matplotlib', 'ipython', 'pandas', 'sympy', 'nose', 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'colorama', 'filelock', 'scikit-image', 'open3d', 'pyrealsense2', 'pathlib', 'psutil', 'gitpython', 'urchin', 'urdf_parser_py', # urdfpy ==> urchin From 4100ad7b7b9374798d3029496c8031f4f024825a Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 13:12:51 -0400 Subject: [PATCH 4/9] Unpin matplotlib --- tools/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup.py b/tools/setup.py index 6cfb44bc..50f9d135 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -25,7 +25,7 @@ "Operating System :: OS Independent", "License :: OSI Approved :: Apache Software License" ], - install_requires=['numpy==1.26.4', 'scipy', 'matplotlib==3.5.0', 'ipython', 'pandas', 'sympy', 'nose', 'sh', 'packaging', + install_requires=['numpy==1.26.4', 'scipy', 'matplotlib', 'ipython', 'pandas', 'sympy', 'nose', 'sh', 'packaging', 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'opencv-contrib-python', 'colorama', 'scikit-image', 'open3d', 'pyrealsense2', 'gitpython', 'xmltodict', 'filelock', 'pyaudio', From d426f0aceea612e71c61b24b2c2e3f347eac90e0 Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 13:17:03 -0400 Subject: [PATCH 5/9] Make body & tools agree on numpy version --- body/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/body/setup.py b/body/setup.py index 5e56997b..f511e471 100644 --- a/body/setup.py +++ b/body/setup.py @@ -19,7 +19,7 @@ "Operating System :: OS Independent", "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)" ], - install_requires=['numpy<=1.26.4', 'scipy', 'matplotlib', 'ipython', 'pandas', 'sympy', 'nose', + install_requires=['numpy==1.26.4', 'scipy', 'matplotlib', 'ipython', 'pandas', 'sympy', 'nose', 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'colorama', 'filelock', 'scikit-image', 'open3d', 'pyrealsense2', 'pathlib', 'psutil', 'gitpython', 'urchin', 'urdf_parser_py', # urdfpy ==> urchin From ad66dc879f2a5fccbae6b0873d2059f09994c224 Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 13:19:47 -0400 Subject: [PATCH 6/9] Remove Python2 dependencies or conditions --- body/setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/body/setup.py b/body/setup.py index f511e471..39524baa 100644 --- a/body/setup.py +++ b/body/setup.py @@ -24,10 +24,9 @@ 'click', 'cma', 'colorama', 'filelock', 'scikit-image', 'open3d', 'pyrealsense2', 'pathlib', 'psutil', 'gitpython', 'urchin', 'urdf_parser_py', # urdfpy ==> urchin 'opencv-contrib-python', 'renamed-opencv-python-inference-engine; python_version >= "3.0.0"', # resolve cv2 conflict for py3 - 'jsonschema==2.6.0; python_version < "3.0"', 'qtconsole==4.7.7; python_version < "3.0"', 'jupyter', # required by juypter - 'llvmlite==0.31.0; python_version < "3.0"', 'numba', # numba required by stretch_funmap, depends on old llvmlite for py2 - 'terminado==0.8.3; python_version < "3.0"', # depend on old terminado for py2 - 'dynamixel-sdk>=3.1; python_version >= "3.0.0"', # py2 gets dynamixel-sdk through ROS + 'jupyter', + 'numba', # numba required by stretch_funmap + 'dynamixel-sdk', 'pyyaml>=5.1', # required for yaml.FullLoader 'hello-robot-stretch-tool-share>=0.3.3', # defines other Stretch end effectors 'hello-robot-stretch-factory>=0.3.5','hello-robot-stretch-body-tools>=0.4.2', From e0352af791cee70a5fe6ce9eb921fca5fd4bc155 Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 13:22:25 -0400 Subject: [PATCH 7/9] Remove Stretch Body dependency from tools It gets installed alongside anyways --- tools/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup.py b/tools/setup.py index 50f9d135..d325bccd 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -31,5 +31,5 @@ 'xmltodict', 'filelock', 'pyaudio', 'pyglet == 1.4.10; python_version < "3.0"', 'trimesh', 'urchin', # urdfpy ==> urchin 'pyyaml>=5.1', # required for yaml.FullLoader - 'hello-robot-stretch-body>=0.7.1'] + ] ) From afaf199f3e3f643dc151aef7afc4cbbf10dec0d2 Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 13:48:50 -0400 Subject: [PATCH 8/9] Pull in the latest transforms3d --- body/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/body/setup.py b/body/setup.py index 39524baa..3b5070fc 100644 --- a/body/setup.py +++ b/body/setup.py @@ -26,6 +26,7 @@ 'opencv-contrib-python', 'renamed-opencv-python-inference-engine; python_version >= "3.0.0"', # resolve cv2 conflict for py3 'jupyter', 'numba', # numba required by stretch_funmap + 'transforms3d>=0.4.2', # required by stretch_core 'dynamixel-sdk', 'pyyaml>=5.1', # required for yaml.FullLoader 'hello-robot-stretch-tool-share>=0.3.3', # defines other Stretch end effectors From 5b81cc1f92564475f5d21cd95496b90ef4a96c3e Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Fri, 23 Aug 2024 14:37:16 -0400 Subject: [PATCH 9/9] It's not enough to unpin trimesh because it leaves trimesh at the outdated version on the user's system, even if they update our package. Instead, I need to pin trimesh to the newest version, to force pip to update it for the user. --- tools/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup.py b/tools/setup.py index d325bccd..35f98abb 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -29,7 +29,7 @@ 'inputs', 'drawnow', 'rplidar-roboticia', 'snakeviz', 'pyusb', 'SpeechRecognition', 'pixel-ring', 'click', 'cma', 'opencv-contrib-python', 'colorama', 'scikit-image', 'open3d', 'pyrealsense2', 'gitpython', 'xmltodict', 'filelock', 'pyaudio', - 'pyglet == 1.4.10; python_version < "3.0"', 'trimesh', 'urchin', # urdfpy ==> urchin + 'pyglet == 1.4.10; python_version < "3.0"', 'trimesh==4.4.7', 'urchin', # urdfpy ==> urchin 'pyyaml>=5.1', # required for yaml.FullLoader ] )