[revert] recover "[refactor] restructure configuration files (#2977)" (#3022)

This reverts commit 35c8f4ce47.
pull/3029/head
Frank Lee 2023-03-07 13:31:23 +08:00 committed by GitHub
parent e86d9bb2e1
commit 2e427ddf42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 22 deletions

1
.clang-format Normal file
View File

@ -0,0 +1 @@
BasedOnStyle: Google

5
.isort.cfg Normal file
View File

@ -0,0 +1,5 @@
[settings]
line_length = 120
multi_line_output=3
include_trailing_comma = true
ignore_comments = true

View File

@ -11,14 +11,13 @@ repos:
hooks:
- id: yapf
name: yapf formatter
args: ['--style=pyproject.toml', '--parallel', '--in-place']
args: ['--style=.style.yapf', '--parallel', '--in-place']
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v13.0.1
hooks:
- id: clang-format
name: clang formatter
args: [--style, "{BasedOnStyle: Google}"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0

5
.style.yapf Normal file
View File

@ -0,0 +1,5 @@
[style]
based_on_style = google
spaces_before_comment = 4
split_before_logical_operator = true
column_limit = 120

View File

@ -138,4 +138,4 @@ You can now create a pull request on the GitHub webpage of your repository. The
Do write clearly the description of your pull request and [link the pull request to your target issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue). This will automatically close the issue when the pull request is approved.
In case of code conflict, you should rebase your branch and resolve the conflicts manually.
In case of code conflict, you should rebase your branch and resolve the conflicts manually.

View File

@ -1,19 +0,0 @@
[tool.isort]
line_length = 120
multi_line_output = 3
include_trailing_comma = true
ignore_comments = true
[tool.yapf]
based_on_style = "google"
spaces_before_comment = 4
split_before_logical_operator = true
column_limit = 120
[tool.pytest.ini_options]
markers = [
"cpu: tests which can run on CPU",
"gpu: tests which requires a single GPU",
"dist: tests which are run in a multi-GPU or multi-machine environment",
"experiment: tests for experimental features",
]

6
pytest.ini Normal file
View File

@ -0,0 +1,6 @@
[pytest]
markers =
cpu: tests which can run on CPU
gpu: tests which requires a single GPU
dist: tests which are run in a multi-GPU or multi-machine environment
experiment: tests for experimental features