Skip to content

Conversation

@PatOnTheBack
Copy link
Contributor

I improved formatting and style to make PyLama happier.

Linters used:

  • mccabe
  • pep257
  • pydocstyle
  • pep8
  • pycodestyle
  • pyflakes
  • pylint
  • isort

I improved formatting and style to make PyLama happier.

Linters used:

- mccabe
- pep257
- pydocstyle
- pep8
- pycodestyle
- pyflakes
- pylint
- isort
@cclauss
Copy link
Member

cclauss commented Jul 6, 2019

The recommendation of the Python Core Team is that you just run python/black

@PatOnTheBack
Copy link
Contributor Author

@cclauss Good to know, I installed black with pip.

This script calculates the volumes of various shapes.
@cclauss
Copy link
Member

cclauss commented Jul 6, 2019

Can you resolve the conflicts?

@TheAlgorithms TheAlgorithms deleted a comment Jul 8, 2019
@PatOnTheBack
Copy link
Contributor Author

@cclauss I cannot resolve the conflicts. The conflicts are too complex to resolve on GitHub.com, but I cannot access the conflicts from git in the terminal, GitHub Desktop, or Atom. I have been troubleshooting for a while without finding a way to resolve the problem. I read GitHub's docs.

git status shows no conflicts, so I don't know what I can try next.

@cclauss
Copy link
Member

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.

Copy link
Member

@cclauss cclauss left a 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.

@cclauss cclauss merged commit 897f1d0 into TheAlgorithms:master Jul 10, 2019
stokhos pushed a commit to stokhos/Python that referenced this pull request Jan 3, 2021
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants