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.

Sign up for GitHub

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

Unit test friendly folder structure for Python examples #237

Merged
merged 6 commits into from
Jan 13, 2025
+17 −0
Merged

Unit test friendly folder structure for Python examples #237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b04476
Unit test friendly folder structure for Python parameters
sea-bass Jan 11, 2025
eb3f7e6
Ensure to add an init file
sea-bass Jan 11, 2025
37ad69e
Format
sea-bass Jan 11, 2025
0d6f149
Ensure other files in module folder do get installed
sea-bass Jan 11, 2025
b0aee7c
More roll back and clean up test
sea-bass Jan 11, 2025
52345ec
Fix
sea-bass Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...meter_module_example/minimal_publisher.py → example_python/examples/minimal_publisher.py
View file
Open in desktop
File renamed without changes.
Empty file removed example_python/generate_parameter_module_example/__init__.py
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions example_python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# set module_name and yaml file
module_name = 'admittance_parameters'
yaml_file = 'generate_parameter_module_example/parameters.yaml'
validation_module = 'generate_parameter_module_example.custom_validation'
validation_module = 'validators.custom_validation'
generate_parameter_module(
module_name, yaml_file, validation_module=validation_module
)
Expand All @@ -33,7 +33,7 @@
tests_require=['pytest'],
entry_points={
'console_scripts': [
'test_node = generate_parameter_module_example.minimal_publisher:main'
'test_node = examples.minimal_publisher:main'
],
},
)
7 changes: 7 additions & 0 deletions example_python/test/test_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import generate_parameter_module_example
print(f'Imported file from: {generate_parameter_module_example.__file__}')
print('OK 1')

import generate_parameter_module_example.admittance_parameters # noqa: E402

print('OK 2')
sea-bass marked this conversation as resolved.
Show resolved Hide resolved
0 ...meter_module_example/custom_validation.py → ...le_python/validators/custom_validation.py
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions generate_parameter_library_py/generate_parameter_library_py/setup_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def generate_parameter_module(module_name, yaml_file, validation_module=''):
install_dir = os.path.join(
colcon_ws,
'install',
pkg_name,
Copy link
Collaborator Author

@sea-bass sea-bass Jan 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

to be fixed in #236, but needed for this PR to work properly

'lib',
py_version,
'site-packages',
Expand Down
Loading