summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-12-26 02:07:53 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2020-12-26 02:07:53 +0100
commitc71bffdb2c0c2cc137b41b628f216180e5ac24b4 (patch)
tree96c486e3a22bedcf95993291eb18aa0fc13d7eff
parent49388d3fbc7081ea293a365cf1c6985171a7eb39 (diff)
parenta7520d5e27c99dc9f70e74e2f34cb90f0e5c2337 (diff)
downloadpsutil-c71bffdb2c0c2cc137b41b628f216180e5ac24b4.tar.gz
Merge branch 'master' into new-cpu-count
-rw-r--r--CREDITS4
-rw-r--r--Makefile4
-rw-r--r--README.rst7
3 files changed, 10 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 9ab16c6e..7e7ce954 100644
--- a/CREDITS
+++ b/CREDITS
@@ -95,6 +95,10 @@ I: 557
Donations
-------------------------------------------------------------------------------
+N: Daniel Widdis
+C: Washington, USA
+W: https://github.com/dbwiddis
+
N: Rodion Stratov
C: Canada
diff --git a/Makefile b/Makefile
index d8ee5edc..087ddd78 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ all: test
# ===================================================================
clean: ## Remove all build files.
- rm -rf `find . -type d -name __pycache__ \
+ @rm -rfv `find . -type d -name __pycache__ \
-o -type f -name \*.bak \
-o -type f -name \*.orig \
-o -type f -name \*.pyc \
@@ -57,7 +57,7 @@ clean: ## Remove all build files.
-o -type f -name \*.so \
-o -type f -name \*.~ \
-o -type f -name \*\$testfn`
- rm -rf \
+ @rm -rfv \
*.core \
*.egg-info \
*\@psutil-* \
diff --git a/README.rst b/README.rst
index 8486cda7..83e79aab 100644
--- a/README.rst
+++ b/README.rst
@@ -130,16 +130,17 @@ Sponsors
Supporters
==========
-None yet.
-
.. raw:: html
+ <div>
+ <a href="https://github.com/dbwiddis"><img height="40" width="40" src="https://avatars1.githubusercontent.com/u/9291703?s=88&amp;u=3a4cbf1ea36068a36392856adb2fb02f623a3235&amp;v=4" /></a>
+ </div>
<sup><a href="https://github.com/sponsors/giampaolo">add your avatar</a></sup>
Contributing
============
-See `CONTRIBUTING.md <https://github.com/giampaolo/psutil/blob/master/CONTRIBUTING.md>`__ guidelines.
+See `contributing guidelines <https://github.com/giampaolo/psutil/blob/master/CONTRIBUTING.md>`__.
Example usages
==============