From e12d8853cd5d6f44f75ab1bab23c54f7f91b32af Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 15 Nov 2020 22:53:59 +0100 Subject: refactor wheels download scripts --- scripts/internal/download_wheels_appveyor.py | 18 +++++++----------- scripts/internal/download_wheels_github.py | 12 ++++-------- 2 files changed, 11 insertions(+), 19 deletions(-) (limited to 'scripts') diff --git a/scripts/internal/download_wheels_appveyor.py b/scripts/internal/download_wheels_appveyor.py index 83ea55a1..bc6c9717 100755 --- a/scripts/internal/download_wheels_appveyor.py +++ b/scripts/internal/download_wheels_appveyor.py @@ -13,7 +13,6 @@ http://code.saghul.net/index.php/2015/09/09/ """ from __future__ import print_function -import argparse import concurrent.futures import os import requests @@ -24,6 +23,8 @@ from psutil._common import bytes2human from psutil._common import print_color +USER = "giampaolo" +PROJECT = "psutil" BASE_URL = 'https://ci.appveyor.com/api' PY_VERSIONS = ['2.7', '3.6', '3.7', '3.8', '3.9'] TIMEOUT = 30 @@ -43,10 +44,10 @@ def download_file(url): return local_fname -def get_file_urls(options): +def get_file_urls(): with requests.Session() as session: data = session.get( - BASE_URL + '/projects/' + options.user + '/' + options.project, + BASE_URL + '/projects/' + USER + '/' + PROJECT, timeout=TIMEOUT) data = data.json() @@ -78,8 +79,8 @@ def rename_win27_wheels(): os.rename(src, dst) -def run(options): - urls = get_file_urls(options) +def run(): + urls = get_file_urls() completed = 0 exc = None with concurrent.futures.ThreadPoolExecutor() as e: @@ -105,12 +106,7 @@ def run(options): def main(): - parser = argparse.ArgumentParser( - description='AppVeyor artifact downloader') - parser.add_argument('--user', required=True) - parser.add_argument('--project', required=True) - args = parser.parse_args() - run(args) + run() if __name__ == '__main__': diff --git a/scripts/internal/download_wheels_github.py b/scripts/internal/download_wheels_github.py index 9de66fc2..5ce98b84 100755 --- a/scripts/internal/download_wheels_github.py +++ b/scripts/internal/download_wheels_github.py @@ -26,10 +26,10 @@ from psutil._common import bytes2human from psutil.tests import safe_rmpath -USER = "" -PROJECT = "" -TOKEN = "" +USER = "giampaolo" +PROJECT = "psutil" OUTFILE = "wheels-github.zip" +TOKEN = "" def get_artifacts(): @@ -77,14 +77,10 @@ def run(): def main(): - global USER, PROJECT, TOKEN + global TOKEN parser = argparse.ArgumentParser(description='GitHub wheels downloader') - parser.add_argument('--user', required=True) - parser.add_argument('--project', required=True) parser.add_argument('--tokenfile', required=True) args = parser.parse_args() - USER = args.user - PROJECT = args.project with open(os.path.expanduser(args.tokenfile)) as f: TOKEN = f.read().strip() try: -- cgit v1.2.1