Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make tools/post-receive python 3 compatible.

This commit is contained in:
Eklavya Sharma 2016-07-24 20:46:02 +05:30
parent 00a120c34f
commit 1a77b599f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/post-receive
View File

@ -33,7 +33,8 @@ import os
import sys import sys
import subprocess import subprocess
sys.path.append(os.path.join(os.path.dirname(__file__), '..')) sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
from zulip_tools import ENDC, FAIL from zerver.lib.str_utils import force_str
from zulip_tools import ENDC, FAIL, subprocess_text_output
def update_deployment(server, refname): def update_deployment(server, refname):
return subprocess.call(["ssh", "-l", "zulip", server, "--", "env", "-u", "GIT_DIR", return subprocess.call(["ssh", "-l", "zulip", server, "--", "env", "-u", "GIT_DIR",
@ -43,7 +44,7 @@ def send_deployment_finished_message(branch, message):
subprocess.check_call(["/home/zulip/zulip/api/bin/zulip-send", "--user=commit-bot@zulip.com", subprocess.check_call(["/home/zulip/zulip/api/bin/zulip-send", "--user=commit-bot@zulip.com",
"--api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "--stream=commits", "--api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "--stream=commits",
"--site=https://zulip.com", "--site=https://zulip.com",
(u"--subject=%s" % (branch,)).encode("utf-8"), "--message=%s" % (message,)]) force_str(u"--subject=%s" % (branch,)), "--message=%s" % (message,)])
deployments = { deployments = {
'refs/heads/prod': ('prod0.zulip.net', 'prod'), 'refs/heads/prod': ('prod0.zulip.net', 'prod'),
@ -71,7 +72,7 @@ for ln in sys.stdin:
# 00...0 means we're deleting the ref # 00...0 means we're deleting the ref
commits = '' commits = ''
else: else:
commits = subprocess.check_output(["git", "log", "%s..%s" % (oldrev, newrev)]) commits = subprocess_text_output(["git", "log", "%s..%s" % (oldrev, newrev)])
if '[schema]' in commits: if '[schema]' in commits:
print() print()

1
tools/run-mypy
View File

@ -74,7 +74,6 @@ exclude_scripts_py2 = [] # type: List[str]
exclude_scripts_py3 = """ exclude_scripts_py3 = """
bots/process_ccache bots/process_ccache
tools/post-receive
""".split() """.split()
parser = argparse.ArgumentParser(description="Run mypy on files tracked by git.") parser = argparse.ArgumentParser(description="Run mypy on files tracked by git.")