-
-
Notifications
You must be signed in to change notification settings - Fork 46.8k
Improved Formatting and Style of Math Algos #960
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.
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
Conversation
I improved formatting and style to make PyLama happier. Linters used: - mccabe - pep257 - pydocstyle - pep8 - pycodestyle - pyflakes - pylint - isort
The recommendation of the Python Core Team is that you just run python/black |
@cclauss Good to know, I installed black with pip. |
This script calculates the volumes of various shapes.
Can you resolve the conflicts? |
@cclauss I cannot resolve the conflicts. The conflicts are too complex to resolve on GitHub.com, but I cannot access the conflicts from
|
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: