Uh oh!
There was an error while loading. Please reload this page.
Improved Formatting and Style of Math Algos - #960
Conversation
I improved formatting and style to make PyLama happier. Linters used: - mccabe - pep257 - pydocstyle - pep8 - pycodestyle - pyflakes - pylint - isort
cclauss
commented
Jul 6, 2019
The recommendation of the Python Core Team is that you just run python/black |
PatOnTheBack
commented
Jul 6, 2019
@cclauss Good to know, I installed black with pip. |
This script calculates the volumes of various shapes.
cclauss
commented
Jul 6, 2019
Can you resolve the conflicts? |
PatOnTheBack
commented
Jul 8, 2019
@cclauss I cannot resolve the conflicts. The conflicts are too complex to resolve on GitHub.com, but I cannot access the conflicts from
|
cclauss
commented
Jul 8, 2019
Conflicts can be a pain... There is just one file that is conflicted so what I would do is go to the current master and copy and paste that content into the file which should have the effect of resolving the conflict. Then once the PR lands, you can go back and fix that one file in a separate PR. |
cclauss
left a comment
There was a problem hiding this comment.
I do not really agree with all uppercase for these variables (would black agree with me)?
BASE=int(input('Enter Base : '))
POWER=int(input("Enter Power : "))but let’s go ahead and merge.
* Improved Formatting and Style I improved formatting and style to make PyLama happier. Linters used: - mccabe - pep257 - pydocstyle - pep8 - pycodestyle - pyflakes - pylint - isort * Create volume.py This script calculates the volumes of various shapes. * Delete lucasSeries.py * Revert "Delete lucasSeries.py" This reverts commit 64c19f7. * Update lucasSeries.py
I improved formatting and style to make PyLama happier.
Linters used: