add more badges

2 files changed, 22 insertions, 21 deletions

diff --git a/README.rst b/README.rst
index 213a4848..7ee41fad 100644
--- a/README.rst
+++ b/README.rst
@@ -1,56 +1,61 @@
-.. image:: https://img.shields.io/pypi/dm/psutil.svg
+|  |downloads| |stars| |forks| |contributors| |coverage| |quality|
+|  |version| |py-versions| |packages| |license|
+|  |travis| |appveyor| |doc| |twitter|
+
+.. |downloads| image:: https://img.shields.io/pypi/dm/psutil.svg
     :target: https://pepy.tech/project/psutil
     :alt: Downloads
 
-.. image:: https://img.shields.io/github/stars/giampaolo/psutil.svg
+.. |stars| image:: https://img.shields.io/github/stars/giampaolo/psutil.svg
     :target: https://github.com/giampaolo/psutil/stargazers
     :alt: Github stars
 
-.. image:: https://img.shields.io/github/forks/giampaolo/psutil.svg
+.. |forks| image:: https://img.shields.io/github/forks/giampaolo/psutil.svg
     :target: https://github.com/giampaolo/psutil/network/members
     :alt: Github forks
 
-.. image:: https://img.shields.io/github/contributors/giampaolo/psutil.svg
+.. |contributors| image:: https://img.shields.io/github/contributors/giampaolo/psutil.svg
     :target: https://github.com/giampaolo/psutil/graphs/contributors
     :alt: Contributors
 
-.. image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux%20/%20macOS
+.. |quality| image:: https://img.shields.io/codacy/grade/ce63e7f7f69d44b5b59682196e6fbfca.svg
+    :target: https://www.codacy.com/app/g-rodola/psutil?utm_source=github.com&utm_medium=referral&utm_content=giampaolo/psutil&utm_campaign=Badge_Grade
+    :alt: Code quality
+
+.. |travis| image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=linux%20/%20osx
     :target: https://travis-ci.org/giampaolo/psutil
     :alt: Linux tests (Travis)
 
-.. image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows
+.. |appveyor| image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=windows
     :target: https://ci.appveyor.com/project/giampaolo/psutil
     :alt: Windows tests (Appveyor)
 
-.. image:: https://coveralls.io/repos/github/giampaolo/psutil/badge.svg?branch=master
+.. |coverage| image:: https://img.shields.io/coveralls/github/giampaolo/psutil.svg?label=test%20coverage
     :target: https://coveralls.io/github/giampaolo/psutil?branch=master
     :alt: Test coverage (coverall.io)
 
-.. image:: https://img.shields.io/codacy/grade/ce63e7f7f69d44b5b59682196e6fbfca.svg
-    :target: https://www.codacy.com/app/g-rodola/psutil?utm_source=github.com&utm_medium=referral&utm_content=giampaolo/psutil&utm_campaign=Badge_Grade
-    :alt: Code quality
-
-.. image:: https://readthedocs.org/projects/psutil/badge/?version=latest
+.. |doc| image:: https://readthedocs.org/projects/psutil/badge/?version=latest
     :target: http://psutil.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
 
-.. image:: https://img.shields.io/pypi/v/psutil.svg?label=pypi
+.. |version| image:: https://img.shields.io/pypi/v/psutil.svg?label=pypi
     :target: https://pypi.org/project/psutil
     :alt: Latest version
 
-.. image:: https://img.shields.io/pypi/pyversions/psutil.svg
+.. |py-versions| image:: https://img.shields.io/pypi/pyversions/psutil.svg
     :target: https://pypi.org/project/psutil
     :alt: Supported Python versions
 
-.. image:: https://repology.org/badge/tiny-repos/python:psutil.svg
+.. |packages| image:: https://repology.org/badge/tiny-repos/python:psutil.svg
     :target: https://repology.org/metapackage/python:psutil/versions
     :alt: Binary packages
 
-.. image:: https://img.shields.io/pypi/l/psutil.svg
+.. |license| image:: https://img.shields.io/pypi/l/psutil.svg
     :target: https://github.com/giampaolo/psutil/blob/master/LICENSE
     :alt: License
 
-.. image:: https://img.shields.io/twitter/follow/grodola.svg?label=follow&style=social
+.. |twitter| image:: https://img.shields.io/twitter/url/https/grodola.svg?label=follow
+    :target: https://twitter.com/grodola
     :alt: Twitter Follow
 
 -----
diff --git a/setup.py b/setup.py
index 2c3d9b36..693bd89d 100755
--- a/setup.py
+++ b/setup.py
@@ -320,10 +320,6 @@ def main():
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6',
-            'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
             'Programming Language :: Python',