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

Aikidopy uses outdated WorldInteractiveMarker #599

Merged
merged 26 commits into from
Jun 3, 2021
Merged

Conversation

egordon
Copy link
Contributor

@egordon egordon commented Apr 9, 2021

Aikidopy relies on the deprecated WorldInteractiveMarkerViewer which was removed in #521

This updates that interface.

Note: this depends on #598 , as this should fix the one failing (not required) test.


Before creating a pull request

  • Document new methods and classes
  • Format code with make format

Before merging a pull request

  • Set version target by selecting a milestone on the right side
  • Summarize this change in CHANGELOG.md
  • Add unit test(s) for this change

@egordon egordon added this to the Aikido 0.5.0 milestone Apr 9, 2021
@egordon egordon requested a review from amalnanavati April 10, 2021 23:38
@sniyaz sniyaz mentioned this pull request Apr 23, 2021
3 tasks
@sniyaz sniyaz changed the base branch from master to egordon/actions April 23, 2021 12:16
@@ -20,7 +20,7 @@ fi
# Build aikidopy and pytest
if [ $BUILD_AIKIDOPY = ON ]; then
./scripts/internal-run.sh catkin build --no-status --no-deps -p 1 -i --cmake-args -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DTREAT_WARNINGS_AS_ERRORS=OFF -DCODECOV=OFF --make-args aikidopy -- aikido
./scripts/internal-run.sh make -C build/aikido pytest
$SUDO ./scripts/internal-run.sh make -C build/aikido pytest
Copy link

@sniyaz sniyaz Apr 23, 2021

Choose a reason for hiding this comment

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

What's the reason for this change? This may be dumb of me, but it seems unrelated to the interface change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CI fails to run without this addition, since the installation step requires sudo.

@@ -94,6 +88,12 @@ set_target_properties(aikidopy
DEBUG_POSTFIX ""
)

execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
Copy link

@sniyaz sniyaz Apr 23, 2021

Choose a reason for hiding this comment

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

Ditto: What's the reason for this change? This may be dumb of me, but it seems unrelated to the interface change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just a small readability change, since this variable is only used in the below lines.

@sniyaz
Copy link

sniyaz commented Apr 23, 2021

Heads up: I changed the base branch to your GH actions one so we can see a better diff.

This seems mostly fine, I just left two comments: I'm a bit confused since those changes don't seem to relate to WorldInteractiveMarkerViewer -> InteractiveMarkerViewer

Base automatically changed from egordon/actions to master April 23, 2021 17:12
@egordon
Copy link
Contributor Author

egordon commented Apr 23, 2021

@sniyaz Responded for review comments and updated CHANGELOG. Ready for re-review

@egordon egordon requested a review from sniyaz April 23, 2021 17:17
@egordon egordon requested review from a team and removed request for gilwoolee, madan96, aditya-vk and hejia-zhang May 7, 2021 01:25
@egordon egordon merged commit 2a906d6 into master Jun 3, 2021
@egordon egordon deleted the egordon/rviz-world branch June 3, 2021 23:16
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.

3 participants