diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-12-26 02:07:53 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-12-26 02:07:53 +0100 |
commit | c71bffdb2c0c2cc137b41b628f216180e5ac24b4 (patch) | |
tree | 96c486e3a22bedcf95993291eb18aa0fc13d7eff | |
parent | 49388d3fbc7081ea293a365cf1c6985171a7eb39 (diff) | |
parent | a7520d5e27c99dc9f70e74e2f34cb90f0e5c2337 (diff) | |
download | psutil-c71bffdb2c0c2cc137b41b628f216180e5ac24b4.tar.gz |
Merge branch 'master' into new-cpu-count
-rw-r--r-- | CREDITS | 4 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | README.rst | 7 |
3 files changed, 10 insertions, 5 deletions
@@ -95,6 +95,10 @@ I: 557 Donations ------------------------------------------------------------------------------- +N: Daniel Widdis +C: Washington, USA +W: https://github.com/dbwiddis + N: Rodion Stratov C: Canada @@ -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-* \ @@ -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&u=3a4cbf1ea36068a36392856adb2fb02f623a3235&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 ============== |