Make project pure python 3.7+

classifiers.txt

@@ -0,0 +1,10 @@
+Development Status :: 4 - Beta
+Environment :: Console
+Environment :: Console :: Curses
+Intended Audience :: Developers
+Intended Audience :: System Administrators
+License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Operating System :: POSIX :: Linux
+Topic :: System :: Monitoring
+Topic :: System :: Networking :: Monitoring
+Programming Language :: Python :: 3 :: Only

pyproject.toml

@@ -0,0 +1,26 @@
+[build-system]
+# Minimum requirements for the build system to execute.
+# PEP 508 specifications for PEP 518.
+requires = [
+    "setuptools >= 61.0.0",
+    "wheel",
+]
+build-backend="setuptools.build_meta"
+
+[project]
+name = "Speedometer"
+version = '2.9'
+description = "Console monitor of the rate of data across a network connection or data being stored in a file"
+requires-python = ">=3.7"
+keywords = ["network", "bandwidth", "monitor", "system", "speed", "download", "file", "progress", "console"]
+license={text="LGPL-2.1-only"}  # Use SPDX classifier
+readme = {file = "README.rst", content-type = "text/x-rst"}
+authors=[{name="Ian Ward", email="ian@excess.org"}]
+dynamic = ["classifiers", "dependencies"]
+
+[project.scripts]
+speedometer = "speedometer:console"
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+classifiers = {file = ["classifiers.txt"]}

requirements.txt

@@ -0,0 +1,3 @@
+urwid >= 2.0
+psutil
+importlib_metadata; python_version < "3.8"

setup.py

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 #
 # Urwid setup.py exports the useful bits
@@ -16,37 +17,12 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
-# Urwid web site: http://excess.org/urwid/
+# Urwid web site: https://urwid.org
 
 from setuptools import setup
 
-import os
-
-setup_d = {
-    'name': "Speedometer",
-    'version': '2.9',
-    'author': "Ian Ward",
-    'author_email': "ian@excess.org",
-    'url': "http://excess.org/speedometer/",
-    'entry_points': {
-        'console_scripts': ['speedometer = speedometer:console'],},
-    'install_requires': ['urwid >= 0.9.9.1', 'psutil'],
-    'license':"LGPL",
-    'keywords':"network bandwidth monitor system speed download file progress console",
-    'platforms':"Linux",
-    'description':"Console monitor of the rate of data across a network connection or data being stored in a file.",
-    'classifiers':[
-        "Development Status :: 4 - Beta",
-        "Environment :: Console",
-        "Environment :: Console :: Curses",
-        "Intended Audience :: Developers",
-        "Intended Audience :: System Administrators",
-        "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
-        "Operating System :: POSIX :: Linux",
-        "Topic :: System :: Monitoring",
-        "Topic :: System :: Networking :: Monitoring",
-        ],
-     }
-
-
-setup(** setup_d)
+setup(
+    name="Speedometer",
+    setup_requires=["setuptools >= 61.0.0",],
+    python_requires=">=3.7",
+)

speedometer.py

@@ -13,23 +13,28 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 
-import time
-import sys
-import os
-import string
 import math
+import os
 import re
-import psutil
-import threading
-import subprocess
 import select
-import pkg_resources
+import string
+import subprocess
+import sys
+import threading
+import time
+
+import psutil
+
+if sys.version_info[:2] >= (3, 8):
+    from importlib import metadata as importlib_metadata
+else:
+    import importlib_metadata
 
 try:
-    __version__ = pkg_resources.get_distribution('speedometer').version
-except pkg_resources.DistributionNotFound:
+    __version__ = importlib_metadata.version("speedometer")
+except ModuleNotFoundError:
     # Not installed yet.
-    __version__ = 'develop'
+    __version__ = "develop"
 
 __usage__ = """Usage: speedometer [options] tap [[-c] tap]...
 Monitor network traffic or speed/progress of a file transfer.  At least one
@@ -87,8 +92,9 @@
 chart_minimum = 2**5
 chart_maximum = 2**32
 
-
 graph_scale = None
+
+
 def update_scale():
     """
     parse_args has set chart min/max, units_per_second and logarithmic_scale
@@ -128,15 +134,17 @@ def update_scale():
         n += granularity
 
 
-
 def graph_min():
     return math.log(chart_minimum,2) if logarithmic_scale else chart_minimum
 
+
 def graph_max():
     return math.log(chart_maximum,2) if logarithmic_scale else chart_maximum
 
+
 def graph_range(): return graph_max() - graph_min()
 
+
 def graph_lines_captions():
     s = graph_scale
     if logarithmic_scale:
@@ -146,8 +154,10 @@ def graph_lines_captions():
         s = [(x - delta, cap) for x, cap in s]
     return list(reversed(s))
 
+
 def graph_lines(): return [x[0] for x in graph_lines_captions()]
 
+
 URWID_IMPORTED = False
 URWID_UTF8 = False
 try:
@@ -212,7 +222,7 @@ def speed(self, *l, **d):
 class EndOfData(Exception):
     pass
 
-class MultiGraphDisplay(object):
+class MultiGraphDisplay:
     def __init__(self, cols, urwid_ui, exit_on_complete, shiny_colors):
         smoothed = urwid_ui == "smoothed"
         self.displays = []
@@ -346,7 +356,7 @@ def __init__(self,tap, smoothed):
         self.spd = Speedometer(6)
         self.feed = tap.feed
         self.description = tap.description()
-        super(GraphDisplay, self).__init__(self.top)
+        super().__init__(self.top)
 
     def update_readings(self):
         f = self.feed()
@@ -1367,7 +1377,7 @@ class ShinyMap(urwid.WidgetPlaceholder):
     def __init__(self, w, colors):
         assert colors in (88, 256)
         self._colors = colors
-        super(ShinyMap, self).__init__(w)
+        super().__init__(w)
         self._shiny_cache = []
         self._shiny_cache_maxrow = None
 
@@ -1402,7 +1412,7 @@ def _rebuild_shiny_cache(self, maxrow):
 
     def render(self, size, focus=False):
         maxcol, maxrow = size
-        canv = super(ShinyMap, self).render(size, focus)
+        canv = super().render(size, focus)
         self._rebuild_shiny_cache(maxrow)
         slivers = []
         y = 0
@@ -1415,7 +1425,6 @@ def render(self, size, focus=False):
         return urwid.CanvasCombine(slivers)
 
 
-
 if __name__ == "__main__":
     try:
         console()