summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-11-08 12:07:56 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-11-08 12:07:56 +0100
commit0c25f9a6b20e11059805f55928cec5bcd18fbf6b (patch)
tree15b701197a8928a402f81ad82213e6b838f518c8
parente3f911e6ab90be10a37edf00c5da2c204513c242 (diff)
downloadpsutil-0c25f9a6b20e11059805f55928cec5bcd18fbf6b.tar.gz
#1167 give CREDITS to @matray
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst2
-rw-r--r--Makefile3
3 files changed, 7 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 95e4bd34..890b8223 100644
--- a/CREDITS
+++ b/CREDITS
@@ -507,3 +507,7 @@ I: 1150
N: Adrian Page
W: https://github.com/adpag
I: 1159, 1160, 1161
+
+N: Matthew Long
+W: https://github.com/matray
+I: 1167
diff --git a/HISTORY.rst b/HISTORY.rst
index 0fba703e..db11d4ab 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -16,6 +16,8 @@
SIGTERM instead of 0. (patch by Akos Kiss)
- 1151_: python -m psutil.tests fail
- 1154_: [AIX] psutil won't compile on AIX 6.1.0. (patch by Arnon Yaari)
+- 1167_: [Windows] net_io_counter() packets count now include also non-unicast
+ packets. (patch by Matthew Long)
5.4.0
=====
diff --git a/Makefile b/Makefile
index 1d6b15be..035c72f3 100644
--- a/Makefile
+++ b/Makefile
@@ -220,7 +220,6 @@ pre-release: ## Check if we're ready to produce a new release.
${MAKE} sdist
release: ## Create a release (down/uploads tar.gz, wheels, git tag release).
-
${MAKE} pre-release
$(PYTHON) -m twine upload dist/* # upload tar.gz and Windows wheels on PYPI
${MAKE} git-tag-release
@@ -256,4 +255,4 @@ check-broken-links: ## Look for broken links in source files.
git ls-files | xargs $(PYTHON) -Wa scripts/internal/check_broken_links.py
help: ## Display callable targets.
- @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+ @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'