nodeocc 1.0.1__tar.gz → 1.0.2__tar.gz

{nodeocc-1.0.1 → nodeocc-1.0.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.1
+Version: 1.0.2
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello
 License: MIT
-Project-URL: Repository, https://github.com/mbosc/slurm_nodeocc
+Project-URL: Repository, https://github.com/apanariello4/slurm_nodeocc
 Keywords: Slurm,GPU,TUI,CLI,HPC,cluster,allocations,nodeocc
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console :: Curses

{nodeocc-1.0.1 → nodeocc-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.1"
+version = "1.0.2"
 authors = [{ name = "Matteo Boschini" }]
 maintainers = [{ name = "Lorenzo Bonicelli" }, { name = "Aniello Panariello" }]
 description = "TUI application for viewing the status of GPU allocations on a Slurm cluster"
@@ -30,7 +30,7 @@ classifiers = [
 dependencies = ["pandas", "numpy"]
 
 [project.urls]
-Repository = "https://github.com/mbosc/slurm_nodeocc"
+Repository = "https://github.com/apanariello4/slurm_nodeocc"
 
 [project.scripts]
 nodeocc = "controller.controller:_main"

{nodeocc-1.0.1 → nodeocc-1.0.2}/src/controller/controller.py

@@ -29,28 +29,35 @@ import importlib.metadata
 
 program_name = 'nodeocc'
 version_number = importlib.metadata.version(program_name)
+updated = False
 
-# get newest version from pip
+BBLUE = '\033[1;34m'
+END = '\033[0m'
 try:
     url = "https://pypi.python.org/pypi/nodeocc/json"
     import requests
     newest_version = json.loads(requests.get(url).text)['info']['version']
+    print(BBLUE, end='')
     if newest_version.split('.')[0] > version_number.split('.')[0]:
         print(f"New major version available: {newest_version} (current: {version_number})")
-        for _ in range(5):
-            print('.', end='')
-            time.sleep(0.5)
+        print(f"Please update with 'pip install {program_name} --upgrade'")
+        time.sleep(7)
     elif newest_version.split('.')[1] > version_number.split('.')[1]:
         print(f"New minor version available: {newest_version} (current: {version_number})")
-        for _ in range(3):
-            print('.', end='')
-            time.sleep(0.5)
+        print(f"Please update with 'pip install {program_name} --upgrade'")
+        time.sleep(7)
     elif newest_version.split('.')[2] > version_number.split('.')[2]:
         print(f"New patch version available: {newest_version} (current: {version_number})")
-        time.sleep(0.5)
+        print(f"Please update with 'pip install {program_name} --upgrade'")
+        time.sleep(7)
+    else:
+        print(f"Up to date: {version_number}")
+        updated = True
+        time.sleep(3)
+    print(END, end='')
 except Exception as e:
-    print(f"Could not get newest version from pip, check if {program_name} is up to date")
-    time.sleep(1)
+    print(f"{BBLUE}Could not get newest version from pip, check if {program_name} is up to date{END}")
+    time.sleep(5)
 
 
 BEGIN_DELIM = "!{$"
@@ -246,6 +253,9 @@ def _main():
         # configure singleton
 
         Singleton.getInstance().signature = f"{program_name} v{version_number}"
+        Singleton.getInstance().version = version_number
+        Singleton.getInstance().updated = updated
+        Singleton.getInstance().newest_version = newest_version
         Singleton.getInstance().fetch_fn = get_all
 
         wrapper(display_main)

{nodeocc-1.0.1 → nodeocc-1.0.2}/src/model/infrastructure.py

@@ -67,7 +67,7 @@ class Infrastructure:
         self.cpu_limit_grp = cpu_limit_grp
         self.cpu_limit_stu = cpu_limit_stu
         self.cpu_limit_stugrp = cpu_limit_stugrp
-        self.prior = ['RTX6000', '2080', 'V100', 'RTXA5000', 'RTX5000', '1080', 'P100', 'n/a', None, 'K80']
+        self.prior = ['n/a', None, 'RTXA5000', 'RTX6000', 'RTX5000', '2080', 'V100', '1080', 'P100', 'K80']
 
     @staticmethod
     def from_dict(d):

{nodeocc-1.0.1 → nodeocc-1.0.2}/src/nodeocc.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.1
+Version: 1.0.2
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello
 License: MIT
-Project-URL: Repository, https://github.com/mbosc/slurm_nodeocc
+Project-URL: Repository, https://github.com/apanariello4/slurm_nodeocc
 Keywords: Slurm,GPU,TUI,CLI,HPC,cluster,allocations,nodeocc
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console :: Curses

{nodeocc-1.0.1 → nodeocc-1.0.2}/src/view/curses_multiwindow.py

@@ -459,8 +459,8 @@ def update_screen(stdscr, instance):
     # get slurm user partition
     stdscr.addstr(lines - 1, xoffset + 62 + 2, f'(Avg time {instance.avg_wait_time})', curses.color_pair(2))
 
-    signature = instance.signature
-    stdscr.addstr(lines - 1, columns - 2 - len(signature), signature)
+    signature = instance.signature if instance.updated else f'{instance.version} -> {instance.newest_version}'
+    stdscr.addstr(lines - 1, columns - 2 - len(signature), signature, curses.color_pair(2) if instance.updated else curses.color_pair(3))
 
     stdscr.refresh()
     curses.doupdate()