Merge conflicts and PEP build fixed#565
Merge conflicts and PEP build fixed#565Purvanshsingh wants to merge 6 commits intoHTTP-APIs:developfrom
Conversation
the functions have been defined in app.py and not been imported from any other file is to avoid the circular dependency issues in flask at the prototype stage. I will fix this issue once the prototype is accepted related to HTTP-APIs#404
Ignored the import error E402 for flake8 to set the PYTHONPATH before all imports are finished.
sameshl
left a comment
sameshl
left a comment
There was a problem hiding this comment.
Hmm, nice work @Purvanshsingh. Although, I did not quite understand the purpose of this PR atm because currently the #456 is still a POC and not ready to be merged. So, we are not looking to merge it anyway.
|
@sameshl, There were lots of changes in the hydrus since the PR was opened. So if someone wants to test it locally might face some issue, so I tried to fix them. |
| app = app_factory(API_NAME) | ||
| socketio = create_socket(app, session) | ||
|
|
||
| # global dict to store mapping of each function to be run before |
There was a problem hiding this comment.
Docstrings go inside the function declaration using triple quotes """
|
|
||
| @custom_before_request('/api/MessageCollection', 'PUT') | ||
| def do_this_before_put_on_drone_collections(): | ||
| print("Do something before PUT request on MessageCollection") |
There was a problem hiding this comment.
we cannot have print statements merged in the main branch
| pass | ||
| set_api_name(app, API_NAME), set_doc(app, apidoc), \ | ||
| set_hydrus_server_url(app, HYDRUS_SERVER_URL), set_session(app, session): | ||
| if __name__ == "__main__": |
There was a problem hiding this comment.
these changes will make the conditionals to run outside of the with statement
|
These changes are not useful |
3 participants
reference #456
Checklist
Current behaviour
Currently #456 having merging conflicts
New expected behaviour
able to merge.
Change logs