From 0c8df039abdf25aab9bd6f048fa13ff438a11d37 Mon Sep 17 00:00:00 2001 From: Johannes Pitz Date: Mon, 2 May 2022 12:06:48 +0200 Subject: [PATCH 1/2] Fix deprecation warning --- murdfpy/urdf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/murdfpy/urdf.py b/murdfpy/urdf.py index 14b0216..b5245e7 100644 --- a/murdfpy/urdf.py +++ b/murdfpy/urdf.py @@ -895,7 +895,7 @@ def color(self): @color.setter def color(self, value): if value is not None: - value = np.asanyarray(value).astype(np.float) + value = np.asanyarray(value).astype(np.float64) value = np.clip(value, 0.0, 1.0) if value.shape != (4,): raise ValueError('Color must be a (4,) float') @@ -2344,7 +2344,7 @@ def get_child_pose(self, cfg=None): raise ValueError('Invalid configuration') def get_child_poses(self, cfg, n_cfgs): - """Computes the child pose relative to a parent pose for a given set of + """Computes the child pose relative to a parent pose for a given set of configuration values. Parameters From c1794b18bf9a58e417abc655a25314d68a5f530e Mon Sep 17 00:00:00 2001 From: Adam Fishman Date: Fri, 29 Apr 2022 17:14:07 -0700 Subject: [PATCH 2/2] Unpinned networkx and pycollada to support new Python version. This will drop Python 2 support --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 5bc4e65..955f7be 100644 --- a/setup.py +++ b/setup.py @@ -5,10 +5,10 @@ requirements = [ 'lxml', # For XML DOM Tree - 'networkx==2.2', # For joint graph + 'networkx', # For joint graph 'numpy', # Numpy 'pillow', # For texture image loading - 'pycollada==0.6', # COLLADA (.dae) mesh loading via trimesh + 'pycollada', # COLLADA (.dae) mesh loading via trimesh 'pyrender>=0.1.20', # For visualization 'scipy', # For trimesh, annoyingly 'six', # Python 2/3 compatability @@ -47,7 +47,6 @@ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Natural Language :: English',