forked from giampaolo/psutil
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into pslisten
* origin/master: (121 commits) update HISTORY/README giampaolo#810: rename windows wheels to make pip 7.1.2 happy add doc warning about disk_io_counter() numbers which may overlap (se giampaolo#802) update HISTORY git travis/osx error fix typo fix travis err add STAT for ps.py Convert string arguments to bytes appveyor download script: check the num of download files and print a warning if it's < than expected win / CI: try not to upgrade pip version and see whether pip produces compatible wheels refactor makefile makefile refactoring makefile refactoring Updated to use better if/else/endif values (my bad) Updated HISTORY to explain better that Win XP still uses 32bit values Reverted test code, will add in a different PR Styling fixes (spaces instead of tabs) PEP 8 compliance and history update (Vista+ only for fix) Type fix Continue on RuntimeError when running df on partitions it can't run on Fix disk_usage test to use 1 kB block size due to issues with OS X Add comment lines to ifs for win versions Actually does need it in XP/2000 unfortunately Tried to keep the mingw32 support but win 7 sdk is causing issues Whoops, whitespace issue Add back in ws2tcpip.h in the proper place in Win XP / Win 2000 Fixes for compiling on Win XP/Win 200 Update HISTORY.rst with giampaolo#816 issue bug fix Fix for windows net_io_counters wrapping after 4.3GB due to MIB_IFROW using DWORD. Updated to use MIB_IF_ROW2 which gives ULONG values instead. This causes more breaking changes for Windows XP and all Windows versions less than Vista / Server 2008 meaning that it should have no problems working on Vista / Server 2008 and beyond. fix doc indentation doc indentation fix giampaolo#829: disk_usage().percent takes reserved root space into account giampaolo#829: add tests to compare disk_usage() with 'df' cmdline utility small refactoring update comment update badges move stuff around reorganize (move stuff in) _common.py def __all__ for _common.py module reorganize (move) test utils update __all__ small @memoize refactoring Fix psutil.virtual_memory() type mismatch for NetBSD. prettyfy code prettyfy code update README Sets Makefile variable for imports compatible with Python 3.x fix linux test memory_maps: use bytes fir unpackment err refactor smaps code linux memory_maps refactoring fix typo update doc update version and HISTORY re-enable win services re-enable all tests on windows try to upgrade pip try to upgrade pip try to upgrade pip try to install pip globally try to upgrade pip force build of old 4.1.0 ver giampaolo#817: add script to download exes/whels from appveyor appveyor exp 5 appveyor exp 4 appveyor exp 3 appveyor exp 2 appveyor/ci#806 (comment) appveyor exp appveyor/ci#806 (comment) appveyor experiment appveyor experiment appveyor: attempt differe VS config for py 3.5 fix typo restore previous appveyor conf + try to add python 3.5 64 bits try easier appveyor conf, see pypa/packaging.python.org#172 try to make appveyor create exes/wheels add freebsd dev notes refactor ctx switches uids/gids refactoring refactor num_threads more refactoring [Linux] Process.name() is 25% faster (on python 3) ignore me remove outdated test [Linux] speedup Process.status() by 28% [Linux] speedup Process.pid() by 20% by reading it from /proc/pid/stat instead of /proc/pid/status set ppid linux set ppid fix 813: have as_dict() ignore extraneous attribute names which getsattached to the Process instance pep8 fixes fix giampaolo#812: [NetBSD] fix compilation on NetBSD-5.x. build fix: MNT_RELATIME and MNT_EXTATTR are not available on NetBSD-5 build fix: declare warn() update IDEAS fix win tests better AD error handling on win service descr: handle unicode errors service descr: handle empty description str check PyUnicodeDecode return value add services memory leak tests update doc ...
- Loading branch information
Showing
40 changed files
with
3,072 additions
and
1,250 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| # Copyright (c) 2009 Giampaolo Rodola'. All rights reserved. | ||
| # Use of this source code is governed by a BSD-style license that can be | ||
| # found in the LICENSE file. | ||
|
|
||
| """ | ||
| Script which downloads exe and wheel files hosted on AppVeyor: | ||
| https://ci.appveyor.com/project/giampaolo/psutil | ||
| Copied and readapted from the original recipe of Ibarra Corretge' | ||
| <saghul@gmail.com>: | ||
| http://code.saghul.net/index.php/2015/09/09/ | ||
| """ | ||
|
|
||
| from __future__ import print_function | ||
| import argparse | ||
| import errno | ||
| import multiprocessing | ||
| import os | ||
| import requests | ||
| import shutil | ||
| import sys | ||
|
|
||
| from concurrent.futures import ThreadPoolExecutor | ||
|
|
||
|
|
||
| BASE_URL = 'https://ci.appveyor.com/api' | ||
| PY_VERSIONS = ['2.7', '3.3', '3.4', '3.5'] | ||
|
|
||
|
|
||
| def term_supports_colors(file=sys.stdout): | ||
| try: | ||
| import curses | ||
| assert file.isatty() | ||
| curses.setupterm() | ||
| assert curses.tigetnum("colors") > 0 | ||
| except Exception: | ||
| return False | ||
| else: | ||
| return True | ||
|
|
||
|
|
||
| if term_supports_colors(): | ||
| def hilite(s, ok=True, bold=False): | ||
| """Return an highlighted version of 'string'.""" | ||
| attr = [] | ||
| if ok is None: # no color | ||
| pass | ||
| elif ok: # green | ||
| attr.append('32') | ||
| else: # red | ||
| attr.append('31') | ||
| if bold: | ||
| attr.append('1') | ||
| return '\x1b[%sm%s\x1b[0m' % (';'.join(attr), s) | ||
| else: | ||
| def hilite(s, *a, **k): | ||
| return s | ||
|
|
||
|
|
||
| def safe_makedirs(path): | ||
| try: | ||
| os.makedirs(path) | ||
| except OSError as err: | ||
| if err.errno == errno.EEXIST: | ||
| if not os.path.isdir(path): | ||
| raise | ||
| else: | ||
| raise | ||
|
|
||
|
|
||
| def safe_rmtree(path): | ||
| def onerror(fun, path, excinfo): | ||
| exc = excinfo[1] | ||
| if exc.errno != errno.ENOENT: | ||
| raise | ||
|
|
||
| shutil.rmtree(path, onerror=onerror) | ||
|
|
||
|
|
||
| def download_file(url): | ||
| local_fname = url.split('/')[-1] | ||
| local_fname = os.path.join('dist', local_fname) | ||
| print(local_fname) | ||
| safe_makedirs('dist') | ||
| r = requests.get(url, stream=True) | ||
| with open(local_fname, 'wb') as f: | ||
| for chunk in r.iter_content(chunk_size=1024): | ||
| if chunk: # filter out keep-alive new chunks | ||
| f.write(chunk) | ||
| return local_fname | ||
|
|
||
|
|
||
| def get_file_urls(options): | ||
| session = requests.Session() | ||
| data = session.get( | ||
| BASE_URL + '/projects/' + options.user + '/' + options.project) | ||
| data = data.json() | ||
|
|
||
| urls = [] | ||
| for job in (job['jobId'] for job in data['build']['jobs']): | ||
| job_url = BASE_URL + '/buildjobs/' + job + '/artifacts' | ||
| data = session.get(job_url) | ||
| data = data.json() | ||
| for item in data: | ||
| file_url = job_url + '/' + item['fileName'] | ||
| urls.append(file_url) | ||
| if not urls: | ||
| sys.exit("no artifacts found") | ||
| for url in sorted(urls, key=lambda x: os.path.basename(x)): | ||
| yield url | ||
|
|
||
|
|
||
| def rename_27_wheels(): | ||
| # See: https://github.com/giampaolo/psutil/issues/810 | ||
| src = 'dist/psutil-4.3.0-cp27-cp27m-win32.whl' | ||
| dst = 'dist/psutil-4.3.0-cp27-none-win32.whl' | ||
| print("rename: %s\n %s" % (src, dst)) | ||
| os.rename(src, dst) | ||
| src = 'dist/psutil-4.3.0-cp27-cp27m-win_amd64.whl' | ||
| dst = 'dist/psutil-4.3.0-cp27-none-win_amd64.whl' | ||
| print("rename: %s\n %s" % (src, dst)) | ||
| os.rename(src, dst) | ||
|
|
||
|
|
||
| def main(options): | ||
| files = [] | ||
| safe_rmtree('dist') | ||
| with ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()) as e: | ||
| for url in get_file_urls(options): | ||
| fut = e.submit(download_file, url) | ||
| files.append(fut.result()) | ||
| # 2 exes (32 and 64 bit) and 2 wheels (32 and 64 bit) for each ver. | ||
| expected = len(PY_VERSIONS) * 4 | ||
| got = len(files) | ||
| if expected != got: | ||
| print(hilite("expected %s files, got %s" % (expected, got), ok=False), | ||
| file=sys.stderr) | ||
| rename_27_wheels() | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| parser = argparse.ArgumentParser( | ||
| description='AppVeyor artifact downloader') | ||
| parser.add_argument('--user', required=True) | ||
| parser.add_argument('--project', required=True) | ||
| args = parser.parse_args() | ||
| main(args) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.