jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375350 )
Change subject: Add a bunch of type hints
......................................................................
Add a bunch of type hints
Change-Id: Id62897c26d4f7b2944f74741bcd9197cf04b44bf
---
M container/thing.py
M docker.py
M mw.py
M run.py
M upgrade.py
5 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container/thing.py b/container/thing.py
index e7381a6..d9f159c 100755
--- a/container/thing.py
+++ b/container/thing.py
@@ -45,7 +45,7 @@
s = requests.Session()
-def gerrit_url(repo, user=None, pw=None):
+def gerrit_url(repo: str, user=None, pw=None) -> str:
host = ''
if user:
if pw:
@@ -58,7 +58,7 @@
@functools.lru_cache()
-def get_packagist_version(package):
+def get_packagist_version(package: str) -> str:
r = s.get('https://packagist.org/packages/%s.json?1' % package)
resp = r.json()['package']['versions']
normalized = set()
@@ -80,7 +80,7 @@
return version
-def commit_and_push(files, msg, branch, topic, remote='origin', plus2=False,
push=True):
+def commit_and_push(files, msg: str, branch: str, topic: str, remote='origin',
plus2=False, push=True):
f = tempfile.NamedTemporaryFile(delete=False)
f.write(bytes(msg, 'utf-8'))
f.close()
@@ -119,7 +119,7 @@
f.write(new)
-def upgrade(env):
+def upgrade(env: dict):
setup(env)
with open('composer.json', 'r') as f:
j = json.load(f, object_pairs_hook=OrderedDict)
@@ -255,7 +255,7 @@
)
-def build_env():
+def build_env() -> dict:
return {
'repo': os.environ['REPO'],
'version': os.environ.get('VERSION'),
@@ -265,7 +265,7 @@
}
-def setup(env):
+def setup(env: dict):
gerrit = gerrit_url(env['repo'])
subprocess.check_call(['git', 'clone', gerrit, 'repo', '--depth=1'])
os.chdir('repo')
diff --git a/docker.py b/docker.py
index 9eb54f7..de9cd4b 100644
--- a/docker.py
+++ b/docker.py
@@ -37,7 +37,7 @@
subprocess.check_call(args)
-def get_running_containers():
+def get_running_containers() -> list:
out = subprocess.check_output(['docker', 'ps', '-q']).decode().strip()
if not out:
return []
@@ -50,7 +50,7 @@
time.sleep(2)
-def logs(name: str):
+def logs(name: str) -> str:
return subprocess.check_output(['docker', 'logs', name]).decode()
diff --git a/mw.py b/mw.py
index e880181..405f5dd 100644
--- a/mw.py
+++ b/mw.py
@@ -45,7 +45,7 @@
return None
-def get_phab_file(gerrit_name, path):
+def get_phab_file(gerrit_name: str, path: str):
url =
'https://phabricator.wikimedia.org/r/p/{};browse/master/{}?view=raw'.format(gerrit_name,
path)
# url =
'https://raw.githubusercontent.com/wikimedia/{}/master/{}'.format(gerrit_name.replace('/',
'-'), path)
print('Fetching ' + url)
diff --git a/run.py b/run.py
index 9d1d834..c3ff228 100755
--- a/run.py
+++ b/run.py
@@ -30,7 +30,7 @@
VERSIONS = ['same', 'dev-master']
-def run(repo, ext_name, version):
+def run(repo: str, ext_name: str, version: str):
env = {
'MODE': 'test',
'REPO': repo,
@@ -41,7 +41,7 @@
docker.run(ext_name + version, env)
-def check_logs(ext_name, version):
+def check_logs(ext_name: str, version: str):
out = docker.logs(ext_name + version)
try:
data = out.split('------------')[1]
diff --git a/upgrade.py b/upgrade.py
index 75dedd2..e4093f4 100755
--- a/upgrade.py
+++ b/upgrade.py
@@ -40,7 +40,7 @@
]
-def run(repo, library, version):
+def run(repo: str, library: str, version: str) -> str:
env = {
'MODE': 'upgrade',
'REPO': repo,
@@ -55,7 +55,7 @@
return name
-def get_safe_logs(name):
+def get_safe_logs(name: str) -> str:
logs = docker.logs(name)
if CONFIG.get('GERRIT_PW'):
# Prevent the password from accidentally leaking
--
To view, visit https://gerrit.wikimedia.org/r/375350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id62897c26d4f7b2944f74741bcd9197cf04b44bf
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
