From 76ea71f256d33eab11a30d48257b9370bf23dc88 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sat, 28 Aug 2021 10:23:19 +0200 Subject: [PATCH] Remove Python 2 in docs and README files --- .github/workflows/test.yml | 2 +- README.rst | 20 +++++++------------- glances/README.txt | 24 ++---------------------- setup.py | 24 ++++++++---------------- sonar-project.properties | 2 +- tox.ini | 2 +- 6 files changed, 20 insertions(+), 54 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0cd40dc..b1f1942a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: [3.4, 3.5, 3.6, 3.7, 3.8, 3.9] steps: diff --git a/README.rst b/README.rst index 192c5b91..9ded1f98 100644 --- a/README.rst +++ b/README.rst @@ -57,20 +57,14 @@ add new plugins or exports modules. Requirements ============ -- ``python>=2.7`` or ``python>=3.4`` +- ``python>=3.4`` - ``psutil>=5.3.0`` (better with latest version) - ``defusedxml`` (in order to monkey patch xmlrpc) -- ``future`` (for Python 2 support) -*Note for Python 2.6 users* +*Note for Python 2 users* -Glances no longer supports Python 2.6. Please upgrade -to a minimum Python version of 2.7/3.4+ or downgrade to Glances 2.6.2 (last version -with Python 2.6 support). - -*Deprecation warning note for Python 2.x users* - -Glances version 4.0 will no longer supports Python 2.x. +Glances version 4 or higher do not support Python 2. +Please uses Glances version 3 if you need Python 2 support. Optional dependencies: @@ -87,7 +81,7 @@ Optional dependencies: - ``influxdb-client`` (for the InfluxDB version 2 export module) [Only for Python >= 3.6] - ``kafka-python`` (for the Kafka export module) - ``netifaces`` (for the IP plugin) -- ``py3nvml`` (for the GPU plugin) [Only for Python 3] +- ``py3nvml`` (for the GPU plugin) - ``pika`` (for the RabbitMQ/ActiveMQ export module) - ``potsdb`` (for the OpenTSDB export module) - ``prometheus_client`` (for the Prometheus export module) @@ -98,7 +92,7 @@ Optional dependencies: - ``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.5] +- ``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] @@ -283,7 +277,7 @@ MacPorts Windows ------- -Install `Python`_ for Windows (Python 2.7.9+ and 3.4+ ship with pip) and +Install `Python`_ for Windows (Python 3.4+ ship with pip) and then run the following command: .. code-block:: console diff --git a/glances/README.txt b/glances/README.txt index fdfb2f12..74782fc7 100644 --- a/glances/README.txt +++ b/glances/README.txt @@ -23,17 +23,7 @@ actions.py Manage trigger actions (via mustache) snmp.py Glances SNMP client (via pysnmp) ... plugins - => Glances data providers - glances_plugins.py "Father class" for others plugins - glances_cpu.py Manage CPU stats - glances_load.py Manage load stats - glances_mem.py Manage RAM stats - glances_memswap.py Manage swap stats - glances_network.py Manage network stats - glances_fs.py Manage file system stats - glances_diskio.py Manage disk I/O stats - glances_docker.py Glances Docker plugin (via docker-py) - glances_raid.py Glances RAID plugin (via pymdstat) + => Glances plugins ... outputs => Glances UI @@ -41,18 +31,8 @@ outputs glances_bottle.py The web interface ... exports - => Glances export interfaces - glances_export.py "Father class" for exports - glances_csv.py The CSV export module - glances_influxdb.py The InfluxDB export module - glances_mqtt.py The MQTT export module - glances_opentsdb.py The OpenTSDB export module - glances_rabbitmq.py The RabbitMQ export module - glances_statsd.py The StatsD export module + => Glances exports ... amps => Glances Application Monitoring Processes (AMP) - glances_amp.py "Father class" for AMPs - glances_default.py Default AMP - glances_nginx.py Nginx AMP ... diff --git a/setup.py b/setup.py index fbfe7a89..2cf7a974 100755 --- a/setup.py +++ b/setup.py @@ -9,14 +9,10 @@ from io import open from setuptools import setup, Command -if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 4): - print('Glances requires at least Python 2.7 or 3.4 to run.') +if sys.version_info < (3, 4): + print('Glances requires at least Python 3.4 to run.') sys.exit(1) -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 - - # Global functions ################## @@ -52,14 +48,15 @@ def get_install_requires(): def get_install_extras_require(): extras_require = { 'action': ['chevron'], - 'browser': ['zeroconf==0.19.1' if PY2 else 'zeroconf>=0.19.1'], + 'browser': ['zeroconf>=0.19.1'], 'cloud': ['requests'], 'docker': ['docker>=2.0.0'], 'export': ['bernhard', 'cassandra-driver', 'couchdb', 'elasticsearch', - 'graphitesender', 'influxdb>=1.0.0', 'kafka-python', 'pika', - 'paho-mqtt', 'potsdb', 'prometheus_client', 'pyzmq', - 'statsd'], - 'folders': ['scandir'], # python_version<"3.5" + 'graphitesender', 'influxdb>=1.0.0', 'influxdb-client', + 'kafka-python', 'pika', 'paho-mqtt', 'potsdb', 'prometheus_client', + 'pyzmq', 'statsd'], + 'folders': ['scandir'], + 'gpu': ['py3nvml'], 'graph': ['pygal'], 'ip': ['netifaces'], 'raid': ['pymdstat'], @@ -70,9 +67,6 @@ def get_install_extras_require(): 'wifi': ['wifi'] #'gpu' and 'sensors' ==> See bellow } - if PY3: - extras_require['export'].append('influxdb-client') - extras_require['gpu'] = ['py3nvml'] if sys.platform.startswith('linux'): extras_require['sensors'] = ['batinfo'] @@ -132,8 +126,6 @@ setup( 'Intended Audience :: System Administrators', 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', diff --git a/sonar-project.properties b/sonar-project.properties index 115aa690..a4d7c23e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ # Required metadata sonar.projectKey=glances sonar.projectName=Glances -sonar.projectVersion=2.7 +sonar.projectVersion=4.0 # Path to the parent source code directory. # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. diff --git a/tox.ini b/tox.ini index ad70bf95..6ae4a0e9 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ # tox [tox] -envlist = py27, py38, py39 +envlist = py39 [testenv] deps =