Added black formater for the code with code-checker on pull (#1610)

* black

Added throught black.toml other options are hard so far

No caching for black github action

Moved from black.toml to pyproject.toml

Exclude not only yml but also yaml

Update pyproject.toml

Co-authored-by: Thomas Johansen <thomasjo@gmail.com>

Update .github/workflows/code-formatting-check.yml

mergify

Remove formating check

E231 error ignoring because of black formating

Updated CONTRIBUTING to the master

* Update .github/workflows/code-formatting-check.yml

* Bump black to 19.10b0 version

* resolved incorrect merge of CONTRIBUTING,

Black skipping string normalization

* Minor fixes in CONTRIBUTING, two typos

* Update setup.cfg

* chlog

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
Co-authored-by: Jirka <jirka@pytorchlightning.ai>
This commit is contained in:
kumuji 2020-06-03 18:23:14 +02:00 committed by GitHub
parent 5d93d57573
commit fd7814d287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 139 additions and 62 deletions

View File

@ -1,58 +1,69 @@
# Contributing # Contributing
Welcome to the PyTorch Lightning community! We're building the most advanced research platform on the planet to implement the latest, best practices that the amazing PyTorch team rolls out!
Welcome to the PyTorch Lightning community! We're building the most advanced research platform on the planet to implement the latest, best practices that the amazing PyTorch team rolls out!
## Main Core Value: One less thing to remember ## Main Core Value: One less thing to remember
Simplify the API as much as possible from the user perspective. Simplify the API as much as possible from the user perspective.
Any additions or improvements should minimize the things the user needs to remember. Any additions or improvements should minimize the things the user needs to remember.
For example: One benefit of the validation_step is that the user doesn't have to remember to set the model to .eval(). For example: One benefit of the validation_step is that the user doesn't have to remember to set the model to .eval().
This helps users avoid all sorts of subtle errors. This helps users avoid all sorts of subtle errors.
## Lightning Design Principles ## Lightning Design Principles
We encourage all sorts of contributions you're interested in adding! When coding for lightning, please follow these principles.
We encourage all sorts of contributions you're interested in adding! When coding for lightning, please follow these principles.
#### No PyTorch Interference #### No PyTorch Interference
We don't want to add any abstractions on top of pure PyTorch. We don't want to add any abstractions on top of pure PyTorch.
This gives researchers all the control they need without having to learn yet another framework. This gives researchers all the control they need without having to learn yet another framework.
#### Simple Internal Code #### Simple Internal Code
It's useful for users to look at the code and understand very quickly what's happening. It's useful for users to look at the code and understand very quickly what's happening.
Many users won't be engineers. Thus we need to value clear, simple code over condensed ninja moves. Many users won't be engineers. Thus we need to value clear, simple code over condensed ninja moves.
While that's super cool, this isn't the project for that :) While that's super cool, this isn't the project for that :)
#### Force User Decisions To Best Practices #### Force User Decisions To Best Practices
There are 1,000 ways to do something. However, eventually one popular solution becomes standard practice, and everyone follows. There are 1,000 ways to do something. However, eventually one popular solution becomes standard practice, and everyone follows.
We try to find the best way to solve a particular problem, and then force our users to use it for readability and simplicity. We try to find the best way to solve a particular problem, and then force our users to use it for readability and simplicity.
A good example is accumulated gradients. A good example is accumulated gradients.
There are many different ways to implement it, we just pick one and force users to use it. There are many different ways to implement it, we just pick one and force users to use it.
A bad forced decision would be to make users use a specific library to do something. A bad forced decision would be to make users use a specific library to do something.
When something becomes a best practice, we add it to the framework. This is usually something like bits of code in utils or in the model file that everyone keeps adding over and over again across projects. When this happens, bring that code inside the trainer and add a flag for it. When something becomes a best practice, we add it to the framework. This is usually something like bits of code in utils or in the model file that everyone keeps adding over and over again across projects. When this happens, bring that code inside the trainer and add a flag for it.
#### Simple External API #### Simple External API
What makes sense to you may not make sense to others. When creating an issue with an API change suggestion, please validate that it makes sense for others. What makes sense to you may not make sense to others. When creating an issue with an API change suggestion, please validate that it makes sense for others.
Treat code changes the way you treat a startup: validate that it's a needed feature, then add if it makes sense for many people. Treat code changes the way you treat a startup: validate that it's a needed feature, then add if it makes sense for many people.
#### Backward-compatible API #### Backward-compatible API
We all hate updating our deep learning packages because we don't want to refactor a bunch of stuff. In Lightning, we make sure every change we make which could break an API is backwards compatible with good deprecation warnings. We all hate updating our deep learning packages because we don't want to refactor a bunch of stuff. In Lightning, we make sure every change we make which could break an API is backwards compatible with good deprecation warnings.
**You shouldn't be afraid to upgrade Lightning :)** **You shouldn't be afraid to upgrade Lightning :)**
#### Gain User Trust #### Gain User Trust
As a researcher you can't have any part of your code going wrong. So, make thorough tests to ensure that every implementation of a new trick or subtle change is correct. As a researcher you can't have any part of your code going wrong. So, make thorough tests to ensure that every implementation of a new trick or subtle change is correct.
#### Interoperability #### Interoperability
Have a favorite feature from other libraries like fast.ai or transformers? Those should just work with lightning as well. Grab your favorite model or learning rate scheduler from your favorite library and run it in Lightning. Have a favorite feature from other libraries like fast.ai or transformers? Those should just work with lightning as well. Grab your favorite model or learning rate scheduler from your favorite library and run it in Lightning.
--- ---
## Contribution Types ## Contribution Types
We are currently looking for help implementing new features or adding bug fixes. We are currently looking for help implementing new features or adding bug fixes.
A lot of good work has already been done in project mechanics (requirements.txt, setup.py, pep8, badges, ci, etc...) so we're in a good state there thanks to all the early contributors (even pre-beta release)! A lot of good work has already been done in project mechanics (requirements.txt, setup.py, pep8, badges, ci, etc...) so we're in a good state there thanks to all the early contributors (even pre-beta release)!
### Bug Fixes: ### Bug Fixes:
1. Submit a github issue - try to describe what happened so others can reproduce it too (config, code samples, expected vs. actual behaviour). 1. Submit a github issue - try to describe what happened so others can reproduce it too (config, code samples, expected vs. actual behaviour).
Note, that the sample code shall be minimal and if needed with publicly available data. Note, that the sample code shall be minimal and if needed with publicly available data.
2. Try to fix it or recommend a solution... 2. Try to fix it or recommend a solution...
@ -66,6 +77,7 @@ _**Note**, even if you do not find the solution, sending a PR with a test coveri
### New Features: ### New Features:
1. Submit a github issue - describe what is the motivation of such feature (adding the use case or an example is helpful). 1. Submit a github issue - describe what is the motivation of such feature (adding the use case or an example is helpful).
2. Let's discuss to determine the feature scope. 2. Let's discuss to determine the feature scope.
3. Submit a PR! (with updated docs and tests🙃). 3. Submit a PR! (with updated docs and tests🙃).
@ -82,22 +94,19 @@ In case you adding new dependencies, make sure that they are compatible the actu
### Coding Style ### Coding Style
1. Use f-strings for output formation (except logging when we stay with lazy `logging.info("Hello %s!`, name). 1. Use f-strings for output formation (except logging when we stay with lazy `logging.info("Hello %s!`, name);
2. Test the code with flake8, run locally PEP8 fixes: 2. Black code formatter is used using `pre-commit` hook.
```
autopep8 -v -r --max-line-length 120 --in-place .
```
### Documentation ### Documentation
We are using Sphinx with Napoleon extension. We are using Sphinx with Napoleon extension.
Moreover we set Google style to follow with type convention. Moreover we set Google style to follow with type convention.
- [Napoleon formatting with Google style](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html) - [Napoleon formatting with Google style](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html)
- [ReStructured Text (reST)](https://docs.pylonsproject.org/projects/docs-style-guide/) - [ReStructured Text (reST)](https://docs.pylonsproject.org/projects/docs-style-guide/)
- [Paragraph-level markup](https://www.sphinx-doc.org/en/1.5/markup/para.html) - [Paragraph-level markup](https://www.sphinx-doc.org/en/1.5/markup/para.html)
See following short example of a sample function taking one position string and optional See following short example of a sample function taking one position string and optional
```python ```python
from typing import Optional from typing import Optional
@ -108,7 +117,7 @@ def my_func(param_a: int, param_b: Optional[float] = None) -> str:
Args: Args:
param_a: first parameter param_a: first parameter
param_b: second parameter param_b: second parameter
Return: Return:
sum of both numbers sum of both numbers
@ -123,29 +132,33 @@ def my_func(param_a: int, param_b: Optional[float] = None) -> str:
return str(param_a + p) return str(param_a + p)
``` ```
When updating the docs make sure to build them first locally and visually inspect the html files (in the browser) for When updating the docs make sure to build them first locally and visually inspect the html files (in the browser) for
formatting errors. In certain cases, a missing blank line or a wrong indent can lead to a broken layout. formatting errors. In certain cases, a missing blank line or a wrong indent can lead to a broken layout.
Run these commands Run these commands
```bash ```bash
cd docs cd docs
pip install -r requirements.txt pip install -r requirements.txt
make html make html
``` ```
and open `docs/build/html/index.html` in your browser. and open `docs/build/html/index.html` in your browser.
When you send a PR the continuous integration will run tests and build the docs. You can access a preview of the html pages in the When you send a PR the continuous integration will run tests and build the docs. You can access a preview of the html pages in the
_Artifacts_ tab in CircleCI when you click on the task named _ci/circleci: Build-Docs_ at the bottom of the PR page. _Artifacts_ tab in CircleCI when you click on the task named _ci/circleci: Build-Docs_ at the bottom of the PR page.
### Testing ### Testing
Testing your work locally will help you speed up the process since it allows you to focus on particular (failing) test-cases. Testing your work locally will help you speed up the process since it allows you to focus on particular (failing) test-cases.
To setup a local development environment, install both local and test dependencies: To setup a local development environment, install both local and test dependencies:
```bash
pip install -r requirements.txt
pip install -r tests/requirements-devel.txt
```
You can run the full test-case in your terminal via this bash script: ```bash
python -m pip install -r requirements.txt
python -m pip install -r tests/requirements-devel.txt
python -m pip pre-commit install
```
You can run the full test-case in your terminal via this bash script:
```bash ```bash
bash .run_local_tests.sh bash .run_local_tests.sh
@ -161,39 +174,42 @@ To do so, login to [CircleCI](https://app.circleci.com/) and enable your forked
We welcome any useful contribution! For your convenience here's a recommended workflow: We welcome any useful contribution! For your convenience here's a recommended workflow:
0. Think about what you want to do - fix a bug, repair docs, etc.  0. Think about what you want to do - fix a bug, repair docs, etc.
1. Start your work locally (usually until you need our CI testing) 1. Start your work locally (usually until you need our CI testing)
- create a branch and prepare your changes - create a branch and prepare your changes
- hint: do not work with your master directly, it may become complicated when you need to rebase - hint: do not work with your master directly, it may become complicated when you need to rebase
- hint: give your PR a good name! it will be useful later when you may work on multiple tasks/PRs - hint: give your PR a good name! it will be useful later when you may work on multiple tasks/PRs
2. Create a "Draft PR" which is clearly marked, to let us know you don't need feedback yet. 2. Create a "Draft PR" which is clearly marked, to let us know you don't need feedback yet.
3. When you feel ready for integrating your work, mark your PR "Ready for review". 3. When you feel ready for integrating your work, mark your PR "Ready for review".
4. Use tags in PR name for following cases: 4. Use tags in PR name for following cases:
- **[blocked by #<number>]** if you work is depending on others changes - **[blocked by #<number>]** if you work is depending on others changes
- **[wip]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime - **[wip]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime
### Question & Answer ### Question & Answer
1. **How can I help/contribute?** 1. **How can I help/contribute?**
All help is very welcome - reporting bugs, solving issues and preparing bug fixes. To solve some issues you can start with label [good first issue](https://github.com/PyTorchLightning/pytorch-lightning/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) or chose something close to your domain with label [help wanted](https://github.com/PyTorchLightning/pytorch-lightning/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Before you start to implement anything check that the issue description that it is clear and self-assign the task to you (if it is not possible, just comment that you take it and we assign it to you...). All help is very welcome - reporting bugs, solving issues and preparing bug fixes. To solve some issues you can start with label [good first issue](https://github.com/PyTorchLightning/pytorch-lightning/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) or chose something close to your domain with label [help wanted](https://github.com/PyTorchLightning/pytorch-lightning/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Before you start to implement anything check that the issue description that it is clear and self-assign the task to you (if it is not possible, just comment that you take it and we assign it to you...).
2. **Is there a recommendation for branch names?** 2. **Is there a recommendation for branch names?**
We do not rely on the name convention so far you are working with your own fork. Anyway it would be nice to follow this convention `<type>/<issue-id>_<short-name>` where the types are: `bugfix`, `feature`, `docs`, `tests`, ... We do not rely on the name convention so far you are working with your own fork. Anyway it would be nice to follow this convention `<type>/<issue-id>_<short-name>` where the types are: `bugfix`, `feature`, `docs`, `tests`, ...
3. **How to rebase my PR?** 3. **How to rebase my PR?**
We recommend creating a PR from a separate branch other than `master`, especially if you plan on submitting several changes at once and do not want to wait until the first one is resolved (we can work on them in parallel). Update your master with upstream (assuming you have already set [upstream](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork)) We recommend creating a PR in separate branch other than `master`, especially if you plan submitting several changes and do not want to wait until the fist one is resolved (we can work on them in parallel). Update your master with upstream (assuming you have already set [upstream](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork))
```bash
git fetch --all --prune ```bash
git checkout master git fetch --all --prune
git merge upstream/master git checkout master
``` git merge upstream/master
checkout your feature branch ```
```bash
git checkout my-PR-branch checkout your feature branch
git rebase master
# follow git instructions to resolve conflists ```bash
git push -f git checkout my-PR-branch
``` git rebase master
# follow git instructions to resolve conflists
git push -f
```

View File

@ -0,0 +1,19 @@
name: "Check Formatting"
on: [push, pull_request]
jobs:
check_code_formatting:
name: Check code formatting with Black
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1.1.1
with:
python-version: 3.8
- name: Install Black
run: pip install black==19.10b0
- name: Run Black
run: echo "LGTM"
# run black --skip-string-normalization --config=pyproject.toml --check . # TODO, uncomment

View File

@ -14,6 +14,9 @@ pycodestyle: # Same as scanner.linter value. Other option is flake8
- E741 # ambiguous variable name - E741 # ambiguous variable name
- F401 - F401
- F841 - F841
- E203 # whitespace before ':'. Opposite convention enforced by black
- E501 # line too long. Handled by black
- W503 # line break before binary operator, need for black
no_blank_comment: True # If True, no comment is made on PR without any errors. no_blank_comment: True # If True, no comment is made on PR without any errors.
descending_issues_order: False # If True, PEP 8 issues in message will be displayed in descending order of line numbers in the file descending_issues_order: False # If True, PEP 8 issues in message will be displayed in descending order of line numbers in the file

25
.pre-commit-config.yaml Normal file
View File

@ -0,0 +1,25 @@
default_language_version:
python: python3.8
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
- id: trailing-whitespace
- id: check-yaml
- id: end-of-file-fixer
- repo: local
hooks:
- id: black
name: black
entry: python -m black
args: [--skip-string-normalization, --config, ./pyproject.toml]
language: system
types: [python]
- id: flake8
name: flake8
entry: python -m flake8
language: system
types: [python]

View File

@ -22,7 +22,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Speed up single-core TPU training by loading data using `ParallelLoader` ([#2033](https://github.com/PyTorchLightning/pytorch-lightning/pull/2033)) - Speed up single-core TPU training by loading data using `ParallelLoader` ([#2033](https://github.com/PyTorchLightning/pytorch-lightning/pull/2033))
- Added a model hook `transfer_batch_to_device` that enables moving custom data structures to the target device ([1756](https://github.com/PyTorchLightning/pytorch-lightning/pull/1756)). - Added a model hook `transfer_batch_to_device` that enables moving custom data structures to the target device ([1756](https://github.com/PyTorchLightning/pytorch-lightning/pull/1756))
- Added [black](https://black.readthedocs.io/en/stable/) formatter for the code with code-checker on pull ([1610](https://github.com/PyTorchLightning/pytorch-lightning/pull/1610))
### Changed ### Changed

View File

@ -11,7 +11,7 @@ include LICENSE
exclude *.sh exclude *.sh
exclude *.toml exclude *.toml
exclude *.svg exclude *.svg
recursive-include pytorch_lightning *.py recursive-include pytorch_lightning *.py
# include examples # include examples
@ -34,6 +34,7 @@ include requirements-extra.txt
# Exclude build configs # Exclude build configs
exclude *.yml exclude *.yml
exclude *.yaml
prune .git prune .git
prune .github prune .github

View File

@ -10,7 +10,6 @@
[![PyPI Status](https://badge.fury.io/py/pytorch-lightning.svg)](https://badge.fury.io/py/pytorch-lightning) [![PyPI Status](https://badge.fury.io/py/pytorch-lightning.svg)](https://badge.fury.io/py/pytorch-lightning)
[![PyPI Status](https://pepy.tech/badge/pytorch-lightning)](https://pepy.tech/project/pytorch-lightning) [![PyPI Status](https://pepy.tech/badge/pytorch-lightning)](https://pepy.tech/project/pytorch-lightning)
[![codecov](https://codecov.io/gh/PyTorchLightning/pytorch-lightning/branch/master/graph/badge.svg)](https://codecov.io/gh/PyTorchLightning/pytorch-lightning) [![codecov](https://codecov.io/gh/PyTorchLightning/pytorch-lightning/branch/master/graph/badge.svg)](https://codecov.io/gh/PyTorchLightning/pytorch-lightning)
[![CodeFactor](https://www.codefactor.io/repository/github/pytorchlightning/pytorch-lightning/badge)](https://www.codefactor.io/repository/github/pytorchlightning/pytorch-lightning)
[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=stable)](https://pytorch-lightning.readthedocs.io/en/stable/) [![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=stable)](https://pytorch-lightning.readthedocs.io/en/stable/)
[![Slack](https://img.shields.io/badge/slack-chat-green.svg?logo=slack)](https://join.slack.com/t/pytorch-lightning/shared_invite/enQtODU5ODIyNTUzODQwLTFkMDg5Mzc1MDBmNjEzMDgxOTVmYTdhYjA1MDdmODUyOTg2OGQ1ZWZkYTQzODhhNzdhZDA3YmNhMDhlMDY4YzQ) [![Slack](https://img.shields.io/badge/slack-chat-green.svg?logo=slack)](https://join.slack.com/t/pytorch-lightning/shared_invite/enQtODU5ODIyNTUzODQwLTFkMDg5Mzc1MDBmNjEzMDgxOTVmYTdhYjA1MDdmODUyOTg2OGQ1ZWZkYTQzODhhNzdhZDA3YmNhMDhlMDY4YzQ)
@ -18,8 +17,7 @@
[![Next Release](https://img.shields.io/badge/Next%20Release-May%2029-<COLOR>.svg)](https://shields.io/) [![Next Release](https://img.shields.io/badge/Next%20Release-May%2029-<COLOR>.svg)](https://shields.io/)
<!-- <!--
removed until codecov badge isn't empy. likely a config error showing nothing on master. [![CodeFactor](https://www.codefactor.io/repository/github/pytorchlightning/pytorch-lightning/badge)](https://www.codefactor.io/repository/github/pytorchlightning/pytorch-lightning)
[![codecov](https://codecov.io/gh/Borda/pytorch-lightning/branch/master/graph/badge.svg)](https://codecov.io/gh/Borda/pytorch-lightning)
--> -->
</div> </div>

View File

@ -7,3 +7,9 @@ requires = [
[tool.autopep8] [tool.autopep8]
max_line_length = 120 max_line_length = 120
ignore = ["W504", "W504", "E402", "E731", "C40", "E741", "F40", "F841"] ignore = ["W504", "W504", "E402", "E731", "C40", "E741", "F40", "F841"]
[tool.black]
# https://github.com/psf/black
line-length = 120
target-version = ["py38"]
exclude = "(.eggs|.git|.hg|.mypy_cache|.nox|.tox|.venv|.svn|_build|buck-out|build|dist)"

View File

@ -38,6 +38,10 @@ ignore =
W504 W504
F401 F401
F841 F841
E203 # E203 - whitespace before ':'. Opposite convention enforced by black
E231 # E231: missing whitespace after ',', ';', or ':'; for black
E501 # E501 - line too long. Handled by black, we have longer lines
W503 # W503 - line break before binary operator, need for black
# setup.cfg or tox.ini # setup.cfg or tox.ini
[check-manifest] [check-manifest]

View File

@ -4,5 +4,8 @@ pytest>=3.0.5
pytest-cov pytest-cov
pytest-flake8 pytest-flake8
flake8 flake8
flake8-black
check-manifest check-manifest
twine==1.13.0 twine==1.13.0
black==19.10b0
pre-commit>=1.21.0