-
Notifications
You must be signed in to change notification settings - Fork 17
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
Fix regression introduced in #21 #28
Conversation
Signed-off-by: ahcorde <[email protected]>
from setuptools import setup | ||
|
||
package_name = 'rqt_console' | ||
|
||
setup( | ||
name=package_name, | ||
version='1.1.1', | ||
packages=find_packages(), | ||
packages=[package_name, package_name + '.filters'], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC you can continue using find_packages()
here (but I would test locally if rqt_reconfigure
is happy with that).
The issue was that the package is nested in the src
directory, in other places our folder structure is rqt_console/rqt_console/__init__.py
instead of rqt_console/src/rqt_console/__init__.py
.
In this case, with the src
folder, you need the package_dir
option below.
Sorry for the error in the previous review.
There's a package_dir
option in setup.cfg
if you prefer that one: https://setuptools.readthedocs.io/en/latest/userguide/package_discovery.html?highlight=find_packages#using-find-or-find-packages.
LGTM with green CI that also tests |
The change fixes the problem for me in local testing, so it looks OK to me. However, I do have a question about this change and the change from #21. The branch that this is being merged into is |
Based on the discussion in the linked issue, targeting Dashing was considered ok: #20 (comment) (see the responses afterwards) |
Ah, thanks for letting me know. In that case, with green CI, I'm going to go ahead and merge this. Thanks for the fix @ahcorde . |
Signed-off-by: ahcorde <[email protected]>
Fix regression introduced in #21. Related with this CI failure https://ci.ros2.org/job/ci_linux/13508/testReport/junit/(root)/rqt_reconfigure/test_test_text_filter/
Signed-off-by: ahcorde [email protected]