Skip to content

Commit 9b2f635

Browse files
authored
format code by black and isort (#6167)
Signed-off-by: Ye Sijun <[email protected]>
1 parent 7f40837 commit 9b2f635

File tree

219 files changed

+2538
-4207
lines changed

Some content is hidden

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

219 files changed

+2538
-4207
lines changed

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
- uses: actions/setup-python@v4
1717
with:
1818
python-version: '3.8'
19-
- run: sudo pip install flake8
20-
- run: ./bin/flake8_tests.sh
19+
- run: sudo pip install flake8 black isort
20+
- run: flake8 .
21+
- run: black --check .
22+
- run: isort --check-only --diff .
2123

2224
backend-unit-tests:
2325
runs-on: ubuntu-22.04

bin/flake8_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ set -o errexit # fail the build if any task fails
55
flake8 --version ; pip --version
66
# stop the build if there are Python syntax errors or undefined names
77
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
8-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
8+
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
99
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics

bin/get_changes.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
11
#!/bin/env python3
22

3-
import sys
43
import re
54
import subprocess
5+
import sys
66

77

88
def get_change_log(previous_sha):
9-
args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', 'master...{}'.format(previous_sha)]
9+
args = [
10+
"git",
11+
"--no-pager",
12+
"log",
13+
"--merges",
14+
"--grep",
15+
"Merge pull request",
16+
'--pretty=format:"%h|%s|%b|%p"',
17+
"master...{}".format(previous_sha),
18+
]
1019
log = subprocess.check_output(args)
1120
changes = []
1221

13-
for line in log.split('\n'):
22+
for line in log.split("\n"):
1423
try:
15-
sha, subject, body, parents = line[1:-1].split('|')
24+
sha, subject, body, parents = line[1:-1].split("|")
1625
except ValueError:
1726
continue
1827

1928
try:
20-
pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
29+
pull_request = re.match(r"Merge pull request #(\d+)", subject).groups()[0]
2130
pull_request = " #{}".format(pull_request)
22-
except Exception as ex:
31+
except Exception:
2332
pull_request = ""
2433

25-
author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
34+
author = subprocess.check_output(["git", "log", "-1", '--pretty=format:"%an"', parents.split(" ")[-1]])[1:-1]
2635

2736
changes.append("{}{}: {} ({})".format(sha, pull_request, body.strip(), author))
2837

2938
return changes
3039

3140

32-
if __name__ == '__main__':
41+
if __name__ == "__main__":
3342
previous_sha = sys.argv[1]
3443
changes = get_change_log(previous_sha)
3544

bin/release_manager.py

+58-35
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
#!/usr/bin/env python3
22
import os
3-
import sys
43
import re
54
import subprocess
5+
import sys
6+
67
import requests
78
import simplejson
89

9-
github_token = os.environ['GITHUB_TOKEN']
10-
auth = (github_token, 'x-oauth-basic')
11-
repo = 'getredash/redash'
10+
github_token = os.environ["GITHUB_TOKEN"]
11+
auth = (github_token, "x-oauth-basic")
12+
repo = "getredash/redash"
13+
1214

1315
def _github_request(method, path, params=None, headers={}):
14-
if not path.startswith('https://api.github.com'):
16+
if not path.startswith("https://api.github.com"):
1517
url = "https://api.github.com/{}".format(path)
1618
else:
1719
url = path
@@ -22,15 +24,18 @@ def _github_request(method, path, params=None, headers={}):
2224
response = requests.request(method, url, data=params, auth=auth)
2325
return response
2426

27+
2528
def exception_from_error(message, response):
26-
return Exception("({}) {}: {}".format(response.status_code, message, response.json().get('message', '?')))
29+
return Exception("({}) {}: {}".format(response.status_code, message, response.json().get("message", "?")))
30+
2731

2832
def rc_tag_name(version):
2933
return "v{}-rc".format(version)
3034

35+
3136
def get_rc_release(version):
3237
tag = rc_tag_name(version)
33-
response = _github_request('get', 'repos/{}/releases/tags/{}'.format(repo, tag))
38+
response = _github_request("get", "repos/{}/releases/tags/{}".format(repo, tag))
3439

3540
if response.status_code == 404:
3641
return None
@@ -39,84 +44,101 @@ def get_rc_release(version):
3944

4045
raise exception_from_error("Unknown error while looking RC release: ", response)
4146

47+
4248
def create_release(version, commit_sha):
4349
tag = rc_tag_name(version)
4450

4551
params = {
46-
'tag_name': tag,
47-
'name': "{} - RC".format(version),
48-
'target_commitish': commit_sha,
49-
'prerelease': True
52+
"tag_name": tag,
53+
"name": "{} - RC".format(version),
54+
"target_commitish": commit_sha,
55+
"prerelease": True,
5056
}
5157

52-
response = _github_request('post', 'repos/{}/releases'.format(repo), params)
58+
response = _github_request("post", "repos/{}/releases".format(repo), params)
5359

5460
if response.status_code != 201:
5561
raise exception_from_error("Failed creating new release", response)
5662

5763
return response.json()
5864

65+
5966
def upload_asset(release, filepath):
60-
upload_url = release['upload_url'].replace('{?name,label}', '')
61-
filename = filepath.split('/')[-1]
67+
upload_url = release["upload_url"].replace("{?name,label}", "")
68+
filename = filepath.split("/")[-1]
6269

6370
with open(filepath) as file_content:
64-
headers = {'Content-Type': 'application/gzip'}
65-
response = requests.post(upload_url, file_content, params={'name': filename}, headers=headers, auth=auth, verify=False)
71+
headers = {"Content-Type": "application/gzip"}
72+
response = requests.post(
73+
upload_url, file_content, params={"name": filename}, headers=headers, auth=auth, verify=False
74+
)
6675

6776
if response.status_code != 201: # not 200/201/...
68-
raise exception_from_error('Failed uploading asset', response)
77+
raise exception_from_error("Failed uploading asset", response)
6978

7079
return response
7180

81+
7282
def remove_previous_builds(release):
73-
for asset in release['assets']:
74-
response = _github_request('delete', asset['url'])
83+
for asset in release["assets"]:
84+
response = _github_request("delete", asset["url"])
7585
if response.status_code != 204:
7686
raise exception_from_error("Failed deleting asset", response)
7787

88+
7889
def get_changelog(commit_sha):
79-
latest_release = _github_request('get', 'repos/{}/releases/latest'.format(repo))
90+
latest_release = _github_request("get", "repos/{}/releases/latest".format(repo))
8091
if latest_release.status_code != 200:
81-
raise exception_from_error('Failed getting latest release', latest_release)
92+
raise exception_from_error("Failed getting latest release", latest_release)
8293

8394
latest_release = latest_release.json()
84-
previous_sha = latest_release['target_commitish']
85-
86-
args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', '{}...{}'.format(previous_sha, commit_sha)]
95+
previous_sha = latest_release["target_commitish"]
96+
97+
args = [
98+
"git",
99+
"--no-pager",
100+
"log",
101+
"--merges",
102+
"--grep",
103+
"Merge pull request",
104+
'--pretty=format:"%h|%s|%b|%p"',
105+
"{}...{}".format(previous_sha, commit_sha),
106+
]
87107
log = subprocess.check_output(args)
88-
changes = ["Changes since {}:".format(latest_release['name'])]
108+
changes = ["Changes since {}:".format(latest_release["name"])]
89109

90-
for line in log.split('\n'):
110+
for line in log.split("\n"):
91111
try:
92-
sha, subject, body, parents = line[1:-1].split('|')
112+
sha, subject, body, parents = line[1:-1].split("|")
93113
except ValueError:
94114
continue
95115

96116
try:
97-
pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
117+
pull_request = re.match(r"Merge pull request #(\d+)", subject).groups()[0]
98118
pull_request = " #{}".format(pull_request)
99-
except Exception as ex:
119+
except Exception:
100120
pull_request = ""
101121

102-
author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
122+
author = subprocess.check_output(["git", "log", "-1", '--pretty=format:"%an"', parents.split(" ")[-1]])[1:-1]
103123

104124
changes.append("{}{}: {} ({})".format(sha, pull_request, body.strip(), author))
105125

106126
return "\n".join(changes)
107127

128+
108129
def update_release_commit_sha(release, commit_sha):
109130
params = {
110-
'target_commitish': commit_sha,
131+
"target_commitish": commit_sha,
111132
}
112133

113-
response = _github_request('patch', 'repos/{}/releases/{}'.format(repo, release['id']), params)
134+
response = _github_request("patch", "repos/{}/releases/{}".format(repo, release["id"]), params)
114135

115136
if response.status_code != 200:
116137
raise exception_from_error("Failed updating commit sha for existing release", response)
117138

118139
return response.json()
119140

141+
120142
def update_release(version, build_filepath, commit_sha):
121143
try:
122144
release = get_rc_release(version)
@@ -125,21 +147,22 @@ def update_release(version, build_filepath, commit_sha):
125147
else:
126148
release = create_release(version, commit_sha)
127149

128-
print("Using release id: {}".format(release['id']))
150+
print("Using release id: {}".format(release["id"]))
129151

130152
remove_previous_builds(release)
131153
response = upload_asset(release, build_filepath)
132154

133155
changelog = get_changelog(commit_sha)
134156

135-
response = _github_request('patch', release['url'], {'body': changelog})
157+
response = _github_request("patch", release["url"], {"body": changelog})
136158
if response.status_code != 200:
137159
raise exception_from_error("Failed updating release description", response)
138160

139161
except Exception as ex:
140162
print(ex)
141163

142-
if __name__ == '__main__':
164+
165+
if __name__ == "__main__":
143166
commit_sha = sys.argv[1]
144167
version = sys.argv[2]
145168
filepath = sys.argv[3]

0 commit comments

Comments
 (0)