Skip to content

Commit 6efd477

Browse files
authored
Merge branch 'master' into rmuller/no-more-black
2 parents 40589b7 + 5431262 commit 6efd477

73 files changed

Lines changed: 936 additions & 364 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mergify/config.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ pull_request_rules:
4343
- status-success~=^Test \(.* java 8 .*$
4444
- status-success~=^Test \(.* java 11 .*$
4545
# One test for Python 3.6, 3.7, and 3.8
46-
- status-success~=^Test \(.* python 3\.6 .*$
47-
- status-success~=^Test \(.* python 3\.7 .*$
48-
- status-success~=^Test \(.* python 3\.8 .*$
46+
- status-success~=^Test \(.* python 3\.6[ )].*$
47+
- status-success~=^Test \(.* python 3\.7[ )].*$
48+
- status-success~=^Test \(.* python 3\.8[ )].*$
4949

5050
- name: Synchronize that PR to upstream and merge it (squash)
5151
actions:
@@ -88,9 +88,9 @@ pull_request_rules:
8888
- status-success~=^Test \(.* java 8 .*$
8989
- status-success~=^Test \(.* java 11 .*$
9090
# One test for Python 3.6, 3.7, and 3.8
91-
- status-success~=^Test \(.* python 3\.6 .*$
92-
- status-success~=^Test \(.* python 3\.7 .*$
93-
- status-success~=^Test \(.* python 3\.8 .*$
91+
- status-success~=^Test \(.* python 3\.6[ )].*$
92+
- status-success~=^Test \(.* python 3\.7[ )].*$
93+
- status-success~=^Test \(.* python 3\.8[ )].*$
9494

9595
- name: Synchronize that PR to upstream and merge it (no-squash)
9696
actions:
@@ -133,9 +133,9 @@ pull_request_rules:
133133
- status-success~=^Test \(.* java 8 .*$
134134
- status-success~=^Test \(.* java 11 .*$
135135
# One test for Python 3.6, 3.7, and 3.8
136-
- status-success~=^Test \(.* python 3\.6 .*$
137-
- status-success~=^Test \(.* python 3\.7 .*$
138-
- status-success~=^Test \(.* python 3\.8 .*$
136+
- status-success~=^Test \(.* python 3\.6[ )].*$
137+
- status-success~=^Test \(.* python 3\.7[ )].*$
138+
- status-success~=^Test \(.* python 3\.8[ )].*$
139139

140140
- name: Clean branch up
141141
actions:

0 commit comments

Comments
 (0)