Fix mavutil imports #49
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…meant to be a module)
| @@ -39,14 +39,3 @@ def main() -> int: | |||
|
|
|||
| # Note: the following fail since JPEG encoding is lossy | |||
There was a problem hiding this comment.
move this to docstring or conf maybe? up to you tho
| from .. import dronekit | ||
| from pymavlink import mavutil |
There was a problem hiding this comment.
why does our version of dronekit not include mavutil?
There was a problem hiding this comment.
I'm pretty sure dronekit never included mavutil. It's just that dronekit depended upon mavutil, and it somehow worked?
TongguangZhang
approved these changes
Aug 25, 2024
maxlou05
added a commit
that referenced
this pull request
Sep 1, 2024
* mavutil is imported from pymavlink and not dronekit * fix linter and add __init__ file for root directory (since common is meant to be a module) * Apparently pytest cannot work if root dir has __init__ file * switch to relative imports * edit ci workflow to upgrade pip first * udpate CI workflow to newer versions * try adding __init__ again * move comment to doc string for test_image_encode_decode
maxlou05
added a commit
that referenced
this pull request
Sep 2, 2024
* Add image_encode and socket_wrapper in lte module * Refactor socket classes into client/server * Refactor network wrapper into "ClientSocket" and "ServerSocket" classes. Write tests for sending images * Run linters/formatters * Black and Pylint changes * Fixes for test_network.py * Refactor pytest into sender and receiver scripts * Fix in ServerSocket constructor * bug fixes for tests, and linter formats * - Refactored to indicate current sockets are TCP specific - Simplified many steps by using higher-level APIs - Added some comments and changed README * Created UDP sockets (#36) * Created UDP Sockets * Addressed Comments * Added send() function and override recv() function in client_socket.py, addressed minor changes in socket_wrapper.py * Made requested changes * Updated docstrings * Modify TCP unit tests to remove image encoding + linter and other fixes * fix rebase to main * add UDP unit tests + pytest automated unit tests for TCP & UDP. Refactored UDP class. * linter fixes * fix relative path issues * add integration test and slight modification to image_encoding * fix network address overuse in pytest due to teardown not fast enough * Update to python 3.11 (#47) * Using own forked dronekit, which is now compatible with python 3.11 * update to python 3.11 * incorporate WARG's dronekit fork as a submodule * fix new dronekit import in tests * fix linter issues * update submodules * minor fixes * add project setup scripts which update submodules as well * remove submodule libraries from requirements * remove empty comment in requirement.txt * Fix mavutil imports (#49) * mavutil is imported from pymavlink and not dronekit * fix linter and add __init__ file for root directory (since common is meant to be a module) * Apparently pytest cannot work if root dir has __init__ file * switch to relative imports * edit ci workflow to upgrade pip first * udpate CI workflow to newer versions * try adding __init__ again * move comment to doc string for test_image_encode_decode * Add image_encode and socket_wrapper in lte module * Refactor socket classes into client/server * Refactor network wrapper into "ClientSocket" and "ServerSocket" classes. Write tests for sending images * Run linters/formatters * Black and Pylint changes * Fixes for test_network.py * Refactor pytest into sender and receiver scripts * Fix in ServerSocket constructor * bug fixes for tests, and linter formats * - Refactored to indicate current sockets are TCP specific - Simplified many steps by using higher-level APIs - Added some comments and changed README * Created UDP sockets (#36) * Created UDP Sockets * Addressed Comments * Added send() function and override recv() function in client_socket.py, addressed minor changes in socket_wrapper.py * Made requested changes * Updated docstrings * Modify TCP unit tests to remove image encoding + linter and other fixes * fix rebase to main * add UDP unit tests + pytest automated unit tests for TCP & UDP. Refactored UDP class. * linter fixes * use relative imports * rename modules to be lower case * make socket's server_address variable private, fixed logger pytest --------- Co-authored-by: Maxwell Lou <maxlou2005@gmail.com> Co-authored-by: Herman Gahra <108769665+HermanG05@users.noreply.github.com> Co-authored-by: Maxwell Lou <62454180+maxlou05@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
mavutil is imported from pymavlink and not dronekit