Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split tsr #367

Merged
merged 10 commits into from
Apr 3, 2017
Merged

Split tsr #367

merged 10 commits into from
Apr 3, 2017

Conversation

Shushman
Copy link
Contributor

This branch removes the tsr subfolder from the prpy package and changes the imports to reflect that.

@brianhou
Copy link
Contributor

Tests fail due to an assortment of ImportErrors. The root cause is a tsr.py in prpy.planning that is found before the tsr module. Renaming tsr.py seems to fix that issue. I'll let you pick the new name.

In addition, there were a couple of places that passed the manip parameter to TSR, which seems like it should be manipindex. Changing that in 8dbb20a made the tests pass.

@Shushman
Copy link
Contributor Author

These are the changes so that prpy/tests/planning now all run:

  • Renamed tsr.py to tsrplanner.py
  • Changed __init__.py to import from tsrplanner

@Shushman
Copy link
Contributor Author

Shushman commented Mar 28, 2017

The final commit is to base/robot.py to change the constructor call to tsrlibrary
The call now provides the manipindex argument to be compatible with tsr without OpenRAVE dependencies. So this merge should happen after tsr is updated to merge the remove_or_deps

Copy link
Contributor

@brianhou brianhou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are failing on Travis. You might need to specify the tsr module as a dependency in package.xml. Running them locally doesn't have that issue.

@brianhou brianhou merged commit f747bd2 into master Apr 3, 2017
@brianhou brianhou deleted the split_tsr branch April 3, 2017 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants