Merge pull request #14 from llee-bdai/llee/python3_10_updates

Python 3.10 Updates
ColinKohler · Nov 17, 2023 · dbe0a42 · dbe0a42
2 parents 867ff9c + 2092352
commit dbe0a42
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/Pipfile b/Pipfile
@@ -8,7 +8,6 @@ verify_ssl = true
 [packages]
 numpy = "*"
 scikit-image = "*"
-attrdict = "*"
 gitpython = "*"
 pyqt5 = "*"
 matplotlib = "*"

diff --git a/baseline_requirements.txt b/baseline_requirements.txt
@@ -1,4 +1,3 @@
-attrdict
 GitPython
 numpy>=1.20.0
 pybullet>=2.7.1

diff --git a/bulletarm/envs/base_env.py b/bulletarm/envs/base_env.py
@@ -925,7 +925,7 @@ def _encodeAction(self, primitive, x, y, z, r):
 
     primitive_idx, x_idx, y_idx, z_idx, rot_idx = map(lambda a: self.action_sequence.find(a),
                                                       ['p', 'x', 'y', 'z', 'r'])
-    action = np.zeros(len(self.action_sequence), dtype=np.float)
+    action = np.zeros(len(self.action_sequence), dtype=float)
     if primitive_idx != -1:
       action[primitive_idx] = primitive
     if x_idx != -1:

diff --git a/bulletarm/pybullet/robots/ur5_robotiq.py b/bulletarm/pybullet/robots/ur5_robotiq.py
@@ -4,7 +4,6 @@
 import numpy as np
 import numpy.random as npr
 from collections import deque, namedtuple
-from attrdict import AttrDict
 from threading import Thread
 
 import pybullet as pb
@@ -61,7 +60,7 @@ def __init__(self):
       "robotiq_85_right_finger_tip_joint"
     ]
     self.robotiq_mimic_multiplier = [1, 1, 1, 1, -1, -1]
-    self.robotiq_joints = AttrDict()
+    self.robotiq_joints = {}
 
   def initialize(self):
     ''''''

diff --git a/docs/env.yaml b/docs/env.yaml
@@ -18,7 +18,6 @@ dependencies:
   - scikit-image
   - scikit-learn
   - gitpython
-  - attrdict
   - tqdm
   - matplotlib
   - pytorch

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-attrdict
 GitPython
 numpy>=1.19.5
 pybullet>=2.7.1