On the road of Glances version 4.0.0

4 files changed, 16 insertions, 17 deletions

diff --git a/NEWS.rst b/NEWS.rst
index 0e108aca..ccccf7cf 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -3,6 +3,12 @@
 ==============================================================================
 
 ===============
+Version 4.0.0
+===============
+
+Under development: https://github.com/nicolargo/glances/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Glances+4.0.0%22
+
+===============
 Version 3.4.0
 ===============
 
diff --git a/README.rst b/README.rst
index 76fdf4da..a9889fe9 100644
--- a/README.rst
+++ b/README.rst
@@ -78,15 +78,15 @@ Any and all contributions are greatly appreciated.
 Requirements
 ============
 
-- ``python>=3.4``
+- ``python>=3.8`` (use Glances 3.4.x for lower Python version)
 - ``psutil>=5.3.0`` (better with latest version)
 - ``defusedxml`` (in order to monkey patch xmlrpc)
 - ``ujson`` (an optimized alternative to the standard json module)
 
 *Note for Python 2 users*
 
-Glances version 4 or higher do not support Python 2.
-Please uses Glances version 3 if you need Python 2 support.
+Glances version 4 or higher do not support Python 2 (and Python 3 < 3.8).
+Please uses Glances version 3.4.x if you need Python 2 support.
 
 Optional dependencies:
 
@@ -96,28 +96,27 @@ Optional dependencies:
 - ``cassandra-driver`` (for the Cassandra export module)
 - ``chevron`` (for the action script feature)
 - ``couchdb`` (for the CouchDB export module)
-- ``docker`` (for the Containers Docker monitoring support) [Linux/macOS-only / Python >= 3.6]
+- ``docker`` (for the Containers Docker monitoring support)
 - ``elasticsearch`` (for the Elastic Search export module)
 - ``graphitesender`` (For the Graphite export module)
 - ``hddtemp`` (for HDD temperature monitoring support) [Linux-only]
 - ``influxdb`` (for the InfluxDB version 1 export module)
-- ``influxdb-client``  (for the InfluxDB version 2 export module) [Only for Python >= 3.6]
+- ``influxdb-client``  (for the InfluxDB version 2 export module)
 - ``kafka-python`` (for the Kafka export module)
 - ``netifaces`` (for the IP plugin)
 - ``py3nvml`` (for the GPU plugin)
 - ``pika`` (for the RabbitMQ/ActiveMQ export module)
-- ``podman`` (for the Containers Podman monitoring support) [Linux/macOS-only / Python >= 3.6]
+- ``podman`` (for the Containers Podman monitoring support)
 - ``potsdb`` (for the OpenTSDB export module)
 - ``prometheus_client`` (for the Prometheus export module)
 - ``py-cpuinfo`` (for the Quicklook CPU info module)
 - ``pygal`` (for the graph export module)
 - ``pymdstat`` (for RAID support) [Linux-only]
-- ``pymongo`` (for the MongoDB export module) [Only for Python >= 3.7]
+- ``pymongo`` (for the MongoDB export module)
 - ``pysnmp`` (for SNMP support)
 - ``pySMART.smartx`` (for HDD Smart support) [Linux-only]
 - ``pyzmq`` (for the ZeroMQ export module)
 - ``requests`` (for the Ports, Cloud plugins and RESTful export module)
-- ``scandir`` (for the Folders plugin) [Only for Python 3.4]
 - ``sparklines`` (for the Quick Plugin sparklines option)
 - ``statsd`` (for the StatsD export module)
 - ``wifi`` (for the wifi plugin) [Linux-only]
diff --git a/glances/__init__.py b/glances/__init__.py
index 2fe91377..7f5ce71a 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -19,7 +19,7 @@ import sys
 # Global name
 # Version should start and end with a numerical char
 # See https://packaging.python.org/specifications/core-metadata/#version
-__version__ = '4.0.0_alpha1'
+__version__ = '4.0.0_beta01'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'
 
diff --git a/setup.py b/setup.py
index 16651e9c..bb923f01 100755
--- a/setup.py
+++ b/setup.py
@@ -41,11 +41,7 @@ def get_install_requires():
         'psutil>=5.6.7',
         'defusedxml',
         'packaging',
-        'future; python_version < "3.0"',
-        'ujson<3; python_version < "3.0"',
-        'ujson<4; python_version >= "3.5" and python_version < "3.6"',
-        'ujson<5; python_version >= "3.6" and python_version < "3.7"',
-        'ujson>=5.4.0; python_version >= "3.7"',
+        'ujson>=5.4.0',
     ]
     if sys.platform.startswith('win'):
         requires.append('bottle')
@@ -74,7 +70,6 @@ def get_install_extras_require():
         'sparklines': ['sparklines'],
         'web': ['bottle', 'requests'],
         'wifi': ['wifi']
-        # 'gpu' and 'sensors' ==> See below
     }
     if sys.platform.startswith('linux'):
         extras_require['sensors'] = ['batinfo']
@@ -116,7 +111,7 @@ setup(
     url='https://github.com/nicolargo/glances',
     license='LGPLv3',
     keywords="cli curses monitoring system",
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.8",
     install_requires=get_install_requires(),
     extras_require=get_install_extras_require(),
     packages=['glances'],
@@ -136,7 +131,6 @@ setup(
         'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',