Skip to content

Commit

Permalink
#810: rename windows wheels to make pip 7.1.2 happy
Browse files Browse the repository at this point in the history
  • Loading branch information
giampaolo committed Jun 18, 2016
1 parent 34caac9 commit 053bc0e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
13 changes: 13 additions & 0 deletions .ci/appveyor/download_exes.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,18 @@ def get_file_urls(options):
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')
Expand All @@ -124,6 +136,7 @@ def main(options):
if expected != got:
print(hilite("expected %s files, got %s" % (expected, got), ok=False),
file=sys.stderr)
rename_27_wheels()


if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues

**Bug fixes**

- #810: [Windows] Windows wheels are incompatible with pip 7.1.2.
- #812: [NetBSD] fix compilation on NetBSD-5.x.
- #823: [NetBSD] virtual_memory() raises TypeError on Python 3.
- #829: [UNIX] psutil.disk_usage() percent field takes root reserved space
Expand Down
6 changes: 6 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,12 @@ Network
{'lo': snetio(bytes_sent=547971, bytes_recv=547971, packets_sent=5075, packets_recv=5075, errin=0, errout=0, dropin=0, dropout=0),
'wlan0': snetio(bytes_sent=13921765, bytes_recv=62162574, packets_sent=79097, packets_recv=89648, errin=0, errout=0, dropin=0, dropout=0)}

.. warning::
on some systems such as Linux, on a very busy or long-lived system these
numbers may wrap (restart from zero), see
`issues #802 <https://github.com/giampaolo/psutil/issues/802>`__.
Applications should be prepared to deal with that.

.. function:: net_connections(kind='inet')

Return system-wide socket connections as a list of namedtuples.
Expand Down
1 change: 1 addition & 0 deletions psutil/tests/test_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,7 @@ def test_parent_ppid(self):
self.assertEqual(p.ppid(), this_parent)
self.assertEqual(p.parent().pid, this_parent)
# no other process is supposed to have us as parent
reap_children(search_all=True)
for p in psutil.process_iter():
if p.pid == sproc.pid:
continue
Expand Down

0 comments on commit 053bc0e

Please sign in to comment.