Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pslisten
Browse files Browse the repository at this point in the history
* origin/master: (150 commits)
  Linux / CPU freq, fixes giampaolo#1481
  improve pmap.py script
  reuse ps.py script in psutil.test()
  move get_terminal_size() in _compat.py
  improve ps.py script
  improve ps.py script
  move bytes2human() into psutil._common and reused it from scripts dir
  fix windows failure re. py 2 vs. 3
  fix linux tests
  fix giampaolo#1474: fix formatting of psutil.tests() which mimicks 'ps aux' output
  give CREDITS for giampaolo#1480
  remove outdated tests
  Fix read access violation in psutil.cpu_count(logical=False) (giampaolo#1480)
  update doc
  update doc
  [Win] Process IO priority constants + high priority (giampaolo#1479 / giampaolo#1476)
  don't fail if there are not prev failed tests
  fix giampaolo#1478: add make command to re-run tests failed on last run
  [Win] return value is not properly handled for undocumented NT* Windows APIs. (giampaolo#1477)
  fix error on py 2.7 where OSError doesn't always have winerror attribute
  update HISTORY for giampaolo#1475
  properly check OSError.winerror
  refactor ionice() on Linux
  refactor ionice() on Linux
  ionice test refactoring
  giampaolo#1404: fix regression not returning CPUs > 9
  give CREDITS to Daniel Beer for giampaolo#1471
  Fix spurious exception when iterating processes on Solaris (giampaolo#1471)
  give CREDITS for giampaolo#1470
  Fix corner case when /etc/mtab doesn't exist and procfs=/proc (giampaolo#1470)
  update DEVNOTES
  Typo fixed (giampaolo#1469)
  giampaolo#1458: implement colors on Windows
  update HISTORY / CREDITS, fix some C warnings
  Make uptime type consitent to fix boot time error. (giampaolo#1225)
  fix giampaolo#1463: cpu_distribution.py script is broken
  update issue template
  issue giampaolo#1404 / linux / phys CPUs count
  Big docfix (giampaolo#1464)
  Big docfix (giampaolo#1464)
  Make tests invariant to LANG setting (giampaolo#1462)
  test runner: show errors on KeyboardInterrupt
  test runner refactoring (avoid code duplication)
  Coloured tests (giampaolo#1459)
  pre-release
  [Windows] calculate USS memory by using NtQueryVirtualMemory (giampaolo#1453)
  fix version highlighting in docs/index (giampaolo#1455)
  fix version highlighting in README (giampaolo#1454)
  run win specific tests twice as fast
  test refactoring
  test: avoid failing at import time
  mention how to run tests in INSTALL guide
  giampaolo#1448: fix Wine support due to missing rtlIpv6AddressToStringA
  update HISTORY
  Fix giampaolo#1329: [AIX] disable some functions based on availability in libperfstat (giampaolo#1349)
  bump up version, fix some doc issues
  fix ResourceWarning
  pre-release
  fix giampaolo#1447: we weren't use @wrap_exceptions around oneshot() (doh\!)
  update doc + change git hook location
  update doc
  make pre-release checks/install src dist in a venv
  add new make command to check tar.gz sanity
  move doc; rephrase it a bit
  add issue templates for 'bug' and 'enhancement' types
  remove issue template commited by accident
  Update issue templates
  giampaolo#1291: (BACKWARD-INCOMPATIBLE) remove memory_maps() on OSX
  Restore Win-7 support on GIT master (5.5.1 was OK) (giampaolo#1446)
  try to fix ntext.h
  restore previous def
  fix compiler warning
  fix compiler warning
  fix compiler warning
  fix compiler warning
  take defs from PH
  set proper  SYSTEM_PROCESS_INFORMATION struct from PH
  fix compilation warnings
  giampaolo#1398 / win / cmdline: call NtQueryInformationProcess twice, the first time to get the right buf size (ProcessHacker does this)
  update doc
  better print formatting for print scripts
  fix giampaolo#1442: use python3 as Makefile default
  appveyor: run print scripts after tests
  highlight top 6 slowest calls
  add printerr() and exit() to shared utils module
  add arg parser for ad script
  introduce a new scriptsutils.py private module shared by all internal utils + refactor print_access_speed.py script
  giampaolo#1291 / OSX: mark memory_maps() as deprecated and make it alwats raise AccessDenied
  OSX memory_maps() - add error handling
  add script for to benchmark API calls
  move access_denied script
  _assert_alive() refactor (linux)
  refactor
  fix NetBSD: Process.connections() may return incomplete results if using oneshot() giampaolo#1439
  add win tests related to send_signal(CTRL_C_EVENT) giampaolo#1227
  fix win test
  fix win tests
  fix backslash warnings
  refactor README a bit
  #fix 1438: do not return any parent() for PID 0 + update doc
  ...
  • Loading branch information
nlevitt committed Apr 9, 2019
2 parents c22cff9 + 05d5164 commit ab4f505
Show file tree
Hide file tree
Showing 93 changed files with 4,277 additions and 3,521 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ elif [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then
pip install -U ipaddress mock
fi

pip install -U coverage coveralls flake8 pep8 setuptools
pip install -U coverage coveralls flake8 setuptools
3 changes: 3 additions & 0 deletions .ci/travis/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then
python -m flake8
fi
fi

PSUTIL_TESTING=1 python -Wa scripts/internal/print_access_denied.py
PSUTIL_TESTING=1 python -Wa scripts/internal/print_api_speed.py
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Bug
about: Report a bug
title: "[OS] title"
labels: 'bug'
assignees: 'giampaolo'

---
**Platform**
* { OS version } (also add appropriate OS issue label (linux, windows, ...))
* { psutil version } (use "pip show psutil")

**Bug description**
{ a clear and concise description of what the bug is }

```
traceback message (if any)
```

```python
code to reproduce the problem (if any)
```

**Test results**
```
output of `python -c psutil.tests` (failures only, not full result)
```
{ you may want to do this in order to discover other issues affecting your platform }
{ if failures look unrelated with the issue at hand open another ticket }
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Enhancement
about: Propose an enhancement
labels: 'enhancement'
assignees: 'giampaolo'
title: "[OS] title"

---

{ a clear and concise description of what the enhancment is about }
Empty file added .github/placeholder
Empty file.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ syntax: glob
*.rej
*.so
*.swp
.failed-tests.txt
.cache/
.idea/
.tox/
Expand Down
114 changes: 75 additions & 39 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ Intro
=====

I would like to recognize some of the people who have been instrumental in the
development of psutil.
I'm sure I'm forgetting some people (feel free to email me), but here is a
short list.
It's modeled after the Linux CREDITS file where the fields are:
name (N), e-mail (E), web-address (W), country (C), description (D), (I) issues
(issue tracker is at https://github.com/giampaolo/psutil/issues).
Really thanks to all of you.
development of psutil. I'm sure I'm forgetting somebody (feel free to email me)
but here is a short list. It's modeled after the Linux CREDITS file where the
fields are: name (N), e-mail (E), website (W), country (C), description (D),
(I) issues. Issue tracker is at https://github.com/giampaolo/psutil/issues).
A big thanks to all of you.

- Giampaolo

Author
======

N: Giampaolo Rodola'
N: Giampaolo Rodola
C: Italy
E: g.rodola@gmail.com
W: http://grodola.blogspot.com/
Expand Down Expand Up @@ -46,8 +44,8 @@ Github usernames of people to CC on github when in need of help.
- AIX:
- wiggin15, Arnon Yaari (maintainer)

Contributors
============
Top contributors
================

N: Jay Loden
C: NJ, USA
Expand All @@ -57,7 +55,14 @@ W: http://www.jayloden.com

N: Arnon Yaari (wiggin15)
W: https://github.com/wiggin15
I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214
D: AIX implementation, expert on multiple fronts
I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408,
1329.

N: Alex Manuskin
W: https://github.com/amanusk
D: FreeBSD cpu_freq(), OSX temperatures, support for Linux temperatures
I: 1284, 1345, 1350, 1352

N: Jeff Tang
W: https://github.com/mrjefftang
Expand All @@ -73,6 +78,24 @@ W: https://github.com/landryb
D: OpenBSD implementation.
I: 615

N: Justin Venus
E: justin.venus@gmail.com
D: Solaris support
I: 18

N: Thomas Klausner
W: https://github.com/0-wiz-0
D: NetBSD implementation (co-author).
I: 557

N: Ryo Onodera
W: https://github.com/ryoon
D: NetBSD implementation (co-author).
I: 557

Contributors
============

N: wj32
E: wj32.64@gmail.com
D: process username() and get_connections() on Windows
Expand All @@ -83,31 +106,32 @@ C: Bologna, Italy
E: yanraber@gmail.com
D: help on Windows development (initial version of Process.username())

N: Justin Venus
E: justin.venus@gmail.com
D: Solaris support
I: 18

N: Dave Daeschler
C: USA
E: david.daeschler@gmail.com
W: http://daviddaeschler.com
D: some contributions to initial design/bootstrap plus occasional bug fixing
I: 522, 536

N: Thomas Klausner
W: https://github.com/0-wiz-0
I: #557

N: Ryo Onodera
W: https://github.com/ryoon
I: #557

N: cjgohlke
E: cjgohlke@gmail.com
D: Windows 64 bit support
I: 107

N: Frank Benkstein
D: process environ()
W: https://github.com/fbenkstein
I: 732, 733

N: Mozilla Foundation
D: sample code for process USS memory.

N: EccoTheFlintstone
W: https://github.com/EccoTheFlintstone
I: 1368, 1348

----

N: Jeffery Kline
E: jeffery.kline@gmail.com
I: 130
Expand Down Expand Up @@ -381,10 +405,6 @@ N: Syohei YOSHIDA
W: https://github.com/syohex
I: 730

N: Frank Benkstein
W: https://github.com/fbenkstein
I: 732, 733

N: Visa Hankala
E: visa@openbsd.org
I: 741
Expand All @@ -402,9 +422,6 @@ N: mpderbec
W: https://github.com/mpderbec
I: 660

N: Mozilla Foundation
D: sample code for process USS memory.

N: wxwright
W: https://github.com/wxwright
I: 776
Expand Down Expand Up @@ -482,7 +499,8 @@ I: 1057

N: Gleb Smirnoff
W: https://github.com/glebius
I: 1042, 1079
D: good help with FreeBSD
I: 1042, 1079, 1070

N: Oleksii Shevchuk
W: https://github.com/alxchk
Expand Down Expand Up @@ -544,10 +562,6 @@ N: Nikhil Marathe
W: https://github.com/nikhilm
I: 1278

N: Alex Manuskin
W: https://github.com/amanusk
I: 1284, 1345, 1350, 1352

N: Sylvain Duchesne
W: https://github.com/sylvainduchesne
I: 1294
Expand All @@ -562,12 +576,34 @@ I: 1332

N: Jaime Fullaondo
W: https://github.com/truthbk
D: AIX support
I: 1320

N: Koen Kooi
W: https://github.com/koenkooi
I: 1360

N: EccoTheFlintstone
W: https://github.com/EccoTheFlintstone
I: 1368
N: Ghislain Le Meur
W: https://github.com/gigi206
D: idea for Process.parents()
I: 1379

N: Benjamin Drung
D: make tests invariant to LANG setting
W: https://github.com/bdrung
I: 1462

N: Xiaoling Bao
I: 1223

N: Cedric Lamoriniere
W: https://github.com/clamoriniere
I: 1470

N: Daniel Beer
W: https://github.com/dbeer1
I: 1471

N: Samer Masterson
W: https://github.com/samertm
I: 1480
Loading

0 comments on commit ab4f505

Please sign in to comment.