Major refactoring: Python 3 support, Bugfixes in PBS Plugin, etc.

.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: build-qtop
+
+on:
+  push:
+    branches:
+      - master
+      - 'releases/**'
+  pull_request:
+    branches:    
+      - master
+
+jobs:
+  build-project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - run: pip install build twine
+      - run: pyproject-build
+      - uses: actions/upload-artifact@v3
+        with:
+          name: qtop-dist
+          path: dist/

.github/workflows/pytest.yml

@@ -0,0 +1,14 @@
+name: pytest-qtop
+
+on: push
+
+jobs:
+  run-pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - run: pip install pytest
+      - run: python -m pytest

CHANGELOG.rst

@@ -1,3 +1,15 @@
+
+0.9.20231110
+------------
+-  Feature enhancement: Migrate to Python 3
+-  Removed: support for Python 2
+-  Feature enhancement: Use argparse instead of optparse
+-  Feature enhancement: Migrate to pyproject.toml
+-  Feature enhancement: Add CI Pipeline
+-  Feature enhancement: Use JSON output for PBS Plugin
+-  Bugfix: Fix parsing of CPU cores in PBS plugin
+-  Bugfix: Add full width output for piping into less
+
 0.9.20161222
 ------------
 -  Bugfix: hotfix for ``tar_out`` issue #283, #284

MANIFEST.in

@@ -3,10 +3,11 @@ include CONTRIBUTING.rst
 include helpfile.txt
 include Makefile
 include MANIFEST.in
-include MIT-license.txt
+include LICENSE
 include qtopconf.yaml
 include qtop.py
 include qtop
+include qtop_py/cli.py
 include qtop_py/colormap.py
 include qtop_py/constants.py
 include qtop_py/contrib/func_tests.sh
@@ -28,10 +29,6 @@ include qtop_py/inputs/jobstatuses.sh
 include qtop_py/inputs/jobsubmits.sh
 include qtop_py/inputs/qtop-input.jdl
 include qtop_py/inputs/qtop-input.sh
-include qtop_py/legacy/counter.py
-include qtop_py/legacy/__init__.py
-include qtop_py/legacy/namedtuple.py
-include qtop_py/legacy/ordereddict.py
 include qtop_py/plugins/demo.py
 include qtop_py/plugins/__init__.py
 include qtop_py/plugins/oar.py

pyproject.toml

@@ -0,0 +1,27 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "qtop"
+dynamic = ["version"]
+description = """
+    qtop: the fast text mode way to monitor your cluster's utilization and status;
+    the time has come to take back control of your cluster's scheduling business"""
+readme = "README.rst"
+authors = [
+    { name="Sotiris Fragkiskos", email="sfranky@gmail.com"},
+]
+requires-python = ">=3"
+
+[project.urls]
+"Homepage" = "https://github.com/qtop/qtop"
+
+[project.scripts]
+qtop = "qtop_py.qtop:main"
+
+[tool.setuptools.dynamic]
+version = {attr = "qtop_py.__version__"}
+
+[tool.setuptools]
+packages = ["qtop_py"]

qtop

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-python -m qtop "$@"
+python3 -m qtop_py.cli "$@"
 

qtop_py/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.20161222"
+__version__ = "0.9.20231110"

qtop_py/cli.py

@@ -0,0 +1,9 @@
+# Copyright 2023 Hewlett Packard Enterprise Development LP
+# SPDX-License-Identifier: MIT
+
+import re
+import sys
+from qtop_py.qtop import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

qtop_py/colormap.py

@@ -1,7 +1,4 @@
-try:
-    from collections import OrderedDict
-except ImportError:
-    from qtop_py.legacy.ordereddict import OrderedDict
+from collections import OrderedDict
 
 # example color maps
 # order should be from more generic-->more specific