Skip to content

Commit

Permalink
networkx 1.* fix and test
Browse files Browse the repository at this point in the history
  • Loading branch information
mikedh committed Sep 3, 2018
1 parent b9b139e commit 89fb72f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -57,6 +57,9 @@ script:
- pip install .[easy]
- pip install triangle xxhash
- pytest --cov=trimesh tests/
- pip install networkx==1.11 -I
- python tests/test_graph.py
- python tests/test_scene.py
- cd examples
- for f in *py*; do python ../tests/notebook_run.py exec "$f"; done
- cd ..
Expand Down
6 changes: 3 additions & 3 deletions trimesh/scene/transforms.py
Expand Up @@ -9,7 +9,7 @@
from .. import transformations


class TransformForest:
class TransformForest(object):

def __init__(self, base_frame='world'):
self.transforms = EnforcedForest()
Expand Down Expand Up @@ -145,8 +145,8 @@ def to_edgelist(self):
a, b, c = edge
# geometry is a node property but save it to the
# edge so we don't need two dictionaries
if 'geometry' in self.transforms.nodes[b]:
c['geometry'] = self.transforms.nodes[b]['geometry']
if 'geometry' in self.transforms.node[b]:
c['geometry'] = self.transforms.node[b]['geometry']
# save the matrix as a float list
c['matrix'] = np.asanyarray(c['matrix'],
dtype=np.float64).tolist()
Expand Down
2 changes: 1 addition & 1 deletion trimesh/version.py
@@ -1 +1 @@
__version__ = '2.33.11'
__version__ = '2.33.12'

0 comments on commit 89fb72f

Please sign in to comment.