search

tableau / TabPy

Execute Python code on the fly and display results in Tableau visualizations:
https://tableau.github.io/TabPy/
MIT License
1.56k stars 598 forks source link

Add return None and modify body arguments #387

Closed phantomcosmonaut closed 4 years ago

phantomcosmonaut commented 4 years ago

Improvements from my last pull but I put simplejson back and fixed the new unit test

pep8speaks commented 4 years ago

Hello @phantomcosmonaut! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! :beers:

Comment last updated at 2019-12-26 16:16:33 UTC
0golovatyi commented 4 years ago

@phantomcosmonaut There are still pep8 warnings in your code change. I would fix those myself but don't have access to your branch.

phantomcosmonaut commented 4 years ago

How do you handle the merge conflicts between the dev and the master branch when both are being edited?

0golovatyi commented 4 years ago

@phantomcosmonaut We will take care of it :) The process is we merge from master to dev first, resolve any conflicts and then open PR dev->master.