Merge branch 'develop' into datapipe

PaddlePaddle · Nov 22, 2021 · 2ba3f00 · 2ba3f00
2 parents b57b865 + d2a05df
commit 2ba3f00
Show file tree

Hide file tree

Showing 283 changed files with 5,775 additions and 2,798 deletions.
diff --git a/.bashrc b/.bashrc
diff --git a/.mergify.yml b/.mergify.yml
@@ -53,7 +53,7 @@ pull_request_rules:
  add: ["T2S"]
  - name: "auto add label=Audio"
  conditions:
- - files~=^paddleaudio/
+ - files~=^audio/
  actions:
  label:
  add: ["Audio"]
@@ -69,6 +69,12 @@ pull_request_rules:
  actions:
  label:
  add: ["Example"]
+ - name: "auto add label=Demo"
+ conditions:
+ - files~=^demos/
+ actions:
+ label:
+ add: ["Demo"]
  - name: "auto add label=README"
  conditions:
  - files~=README.md
@@ -77,7 +83,7 @@ pull_request_rules:
  add: ["README"]
  - name: "auto add label=Documentation"
  conditions:
- - files~=^doc/
+ - files~=^docs/
  actions:
  label:
  add: ["Documentation"]

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,8 +13,8 @@
  files: (?!.*paddle)^.*$
  - id: end-of-file-fixer
  files: \.md$
- - id: trailing-whitespace
- files: \.md$
+ #- id: trailing-whitespace
+ # files: \.md$
  - id: requirements-txt-fixer
  exclude: (?=third_party).*$
  - id: check-yaml