Merge branch 'dependabot/pip/numpy-2.2.4'

# Conflicts:
#	tests/test_chargedPlanner.py

Author: danieleTrimarchi

pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 dependencies = [
     "colorama==0.4.6",
     "keyring==25.6.0",
-    "numpy==2.2.3",
+    "numpy==2.2.4",
     "pandas==2.2.3",
     "plotly==6.0.1",
     "requests==2.32.3"

requirements.txt

@@ -1,7 +1,7 @@
 colorama==0.4.6
 flake8==7.1.2
 keyring==25.6.0
-numpy==2.2.3
+numpy==2.2.4
 pandas==2.2.3
 plotly==6.0.1
 pytest==8.3.5

src/chargedPlanner/chargedPlanner.py

@@ -11,6 +11,8 @@
 
 from pyexpat import features
 
+import pandas.core.frame
+
 current_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(current_dir)
 
@@ -41,6 +43,25 @@ def get_config_filePath() -> Path :
         )
         return Path(current_dir + "/data/config.json")
 
+def prepare_for_gantt(tasks : list) -> [pandas.core.frame.DataFrame, dict] :
+
+    import pandas as pd
+    df = pd.DataFrame(tasks)
+
+    # Convert to DataFrame and Reset Index
+    df = pd.DataFrame(tasks)
+    df.reset_index(drop=True, inplace=True)
+
+    def random_warm_color():
+        """Generate a bright RGB color."""
+        import random
+        return f"rgb({random.randint(100, 255)}, {random.randint(100, 250)}, {random.randint(0, 255)})"
+
+    unique_tasks = df["Task"].unique()
+    color_dict = {task: random_warm_color() for task in unique_tasks}
+
+    return [df,color_dict]
+
 
 class Calendar(object):
 
@@ -575,20 +596,7 @@ def gantt(self) -> None:
             if not len(tasks):
                 return
 
-            import pandas as pd
-            df = pd.DataFrame(tasks)
-
-            # Convert to DataFrame and Reset Index
-            df = pd.DataFrame(tasks)
-            df.reset_index(drop=True, inplace=True)
-
-            def random_warm_color():
-                """Generate a bright RGB color."""
-                import random
-                return f"rgb({random.randint(100, 255)}, {random.randint(100, 250)}, {random.randint(0, 255)})"
-
-            unique_tasks = df["Task"].unique()
-            color_dict = {task: random_warm_color() for task in unique_tasks}
+            [df,color_dict] = prepare_for_gantt(tasks)
 
             fig = ff.create_gantt(df, colors=color_dict, index_col="Task", show_colorbar=False, group_tasks=True,
                                    title="Task Schedule")

tests/test_chargedPlanner.py

@@ -181,17 +181,8 @@ def test_figure() :
 		for i in range(1, 15)
 	]
 
-	# Convert to DataFrame and Reset Index
-	df = pd.DataFrame(tasks)
-	df.reset_index(drop=True, inplace=True)
-
-	def random_warm_color():
-		"""Generate a bright RGB color."""
-		import random
-		return f"rgb({random.randint(100, 255)}, {random.randint(100, 250)}, {random.randint(0, 255)})"
-
-	unique_tasks = df["Task"].unique()
-	color_dict = {task: random_warm_color() for task in unique_tasks}
+	from src.chargedPlanner.chargedPlanner import prepare_for_gantt
+	[df, color_dict] = prepare_for_gantt(tasks)
 
 	# Create Gantt Chart
 	fig = ff.create_gantt(df,
@@ -203,6 +194,7 @@ def random_warm_color():
 	fig.show()
 
 
+
 # def test_dev_gantt_many() :
 #
 # 	test_setup()