Separated the dependencies in extra strings, so the install with no extra is the bare metrics gathering core (without even the docker extra)

Author: jmfernandez

MANIFEST.in

@@ -1,3 +1,6 @@
 include LICENSE
 include README.md
-include installation/requirements.txt
+include installation/requirements.txt
+include installation/requirements-core.txt
+include installation/requirements-docker.txt
+include installation/requirements-analytics.txt

installation/requirements-analytics.txt

@@ -0,0 +1,4 @@
+pandas
+networkx
+matplotlib
+adjustText

installation/requirements-core.txt

@@ -0,0 +1 @@
+psutil

installation/requirements-docker.txt

@@ -0,0 +1 @@
+docker

installation/requirements.txt

@@ -1,6 +1,3 @@
-psutil
-docker
-pandas
-networkx
-matplotlib
-adjustText
+-r requirements-core.txt
+-r requirements-docker.txt
+-r requirements-analytics.txt

setup.py

@@ -3,7 +3,7 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 # treecript, a process tree metrics gatherer.
-# Copyright (C) 2025 Barcelona Supercomputing Center, José M. Fernández
+# Copyright (C) 2026 Barcelona Supercomputing Center, José M. Fernández
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,19 @@
 import sys
 import setuptools
 
+from typing import (
+    cast,
+    TYPE_CHECKING,
+)
+
+if TYPE_CHECKING:
+    from typing import (
+        Final,
+        MutableMapping,
+        MutableSequence,
+        Sequence,
+    )
+
 # In this way, we are sure we are getting
 # the installer's version of the library
 # not the system's one
@@ -33,21 +46,65 @@
 from treecript import __author__ as epmc_author  # noqa: E402
 from treecript import __license__ as epmc_license  # noqa: E402
 
+EGG_PAT = re.compile(r"#[^#]*egg=([^=&]+)")
+OTHER_REQ_PAT = re.compile(r"^-r\s+(.+)")
+REQ_SECT_PAT = re.compile(r"^requirements-([^.]+)\.txt$")
+
+CORE_REQUIREMENTS: "Final[str]" = "core"
+
+
+def populate_extra_requirements(
+    requirements_path: "str", section: "str" = CORE_REQUIREMENTS
+) -> "MutableMapping[str, Sequence[str]]":
+    extra_requirements: "MutableMapping[str, MutableSequence[str]]" = {}
+    if os.path.exists(requirements_path):
+        # Be sure the path is an absolute one
+        if not os.path.isabs(requirements_path):
+            requirements_path = os.path.abspath(requirements_path)
+
+        with open(requirements_path, mode="r", encoding="utf-8") as f:
+            for line in f.read().splitlines():
+                rm = OTHER_REQ_PAT.search(line)
+                if rm is None:
+                    print(f"R {line}")
+                    m = EGG_PAT.search(line)
+                    extra_requirements.setdefault(section, []).append(
+                        line if m is None else m.group(1)
+                    )
+                else:
+                    # This is needed for cases like -r
+                    other_requirements_path = os.path.realpath(
+                        os.path.join(os.path.dirname(requirements_path), rm.group(1))
+                    )
+                    other_requirements_basename = os.path.basename(
+                        other_requirements_path
+                    )
+
+                    nested_section = section
+                    rsmatch = REQ_SECT_PAT.search(other_requirements_basename)
+                    if rsmatch is not None:
+                        nested_section = rsmatch.group(1)
+
+                    nested_extra_requirements = populate_extra_requirements(
+                        other_requirements_path, section=nested_section
+                    )
+                    for nested_sect, nested_deps in nested_extra_requirements.items():
+                        extra_requirements.setdefault(nested_sect, []).extend(
+                            nested_deps
+                        )
+
+    return cast("MutableMapping[str, Sequence[str]]", extra_requirements)
+
+
 # Populating the long description
 readme_path = os.path.join(setupDir, "README.md")
 with open(readme_path, "r") as fh:
     long_description = fh.read()
 
 # Populating the install requirements
-requirements = []
 requirements_path = os.path.join(setupDir, "installation", "requirements.txt")
-if os.path.exists(requirements_path):
-    with open(requirements_path, mode="r", encoding="utf-8") as f:
-        egg = re.compile(r"#[^#]*egg=([^=&]+)")
-        for line in f.read().splitlines():
-            print(f"R {line}")
-            m = egg.search(line)
-            requirements.append(line if m is None else m.group(1))
+extra_requirements = populate_extra_requirements(requirements_path)
+requirements = extra_requirements.pop(CORE_REQUIREMENTS, [])
 
 setuptools.setup(
     name="treecript",
@@ -78,7 +135,19 @@
         "legacy/plotGraph.sh",
         "legacy/plot-metrics.sh",
     ],
+    entry_points={
+        "console_scripts": [
+            "execution-metrics-collector = treecript.collector:main__commandline",
+            "process-metrics-collector = treecript.collector:main",
+            "cpuinfo-tdp-finder = treecript.tdp_finder:main_cpuinfo_tdp_finder",
+            "modelname-tdp-finder = treecript.tdp_finder:main_modelname_tdp_finder",
+            "tdp-finder = treecript.tdp_finder:main_tdp_finder",
+            "metrics-aggregator = treecript.aggregator:main [analytics]",
+            "plotGraph = treecript.plot_graph:main [analytics]",
+        ],
+    },
     install_requires=requirements,
+    extras_require=extra_requirements,
     # See https://pypi.org/classifiers/
     classifiers=[
         "Programming Language :: Python :: 3",

treecript/__init__.py

@@ -3,7 +3,7 @@
 
 # SPDX-License-Identifier: GPL-3.0-or-later
 # treecript, a process tree metrics gatherer.
-# Copyright (C) 2025 Barcelona Supercomputing Center, José M. Fernández
+# Copyright (C) 2026 Barcelona Supercomputing Center, José M. Fernández
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,4 +23,4 @@
 __license__ = "GPL-3.0-or-later"
 
 # https://www.python.org/dev/peps/pep-0396/
-__version__ = "0.6.1"
+__version__ = "0.7.0"

treecript/collector.py

@@ -21,7 +21,6 @@
 import atexit
 import copy
 import datetime
-import docker
 import json
 import logging
 import os
@@ -343,12 +342,23 @@ def process_metrics_collector(
         print("\t".join(agg_metrics_cols), file=cH)
 
     docker_cli = None
+    docker_errors_NotFound = BaseException
     if match_docker:
         try:
-            docker_cli = docker.from_env()
-        except docker.errors.DockerException:
+            import docker
+
+            try:
+                docker_cli = docker.from_env()
+
+            except docker.errors.DockerException:
+                logger.info(
+                    "Docker service not reachable. Processes spawned using docker will not be properly tracked"
+                )
+            finally:
+                docker_errors_NotFound = docker.errors.NotFound  # type: ignore[assignment]
+        except ModuleNotFoundError:
             logger.info(
-                "Docker service not reachable. Processes spawned using docker will not be properly tracked"
+                "Docker python feature not installed. Processes spawned using docker will not be properly tracked"
             )
 
     recorded_pids: "MutableMapping[int, psutil.Process]" = dict()
@@ -429,16 +439,19 @@ def process_metrics_collector(
                         container_data.sort(key=lambda c: c[1])
 
                     break
-                except docker.errors.NotFound:
-                    tries -= 1
-                    if tries == 0:
-                        logger.warning(
-                            "Failed getting the list of docker instances after 5 tries"
-                        )
+                except BaseException as be:
+                    if docker_errors_NotFound != BaseException and isinstance(  # noqa: E721
+                        be, docker_errors_NotFound
+                    ):  # noqa: E721
+                        tries -= 1
+                        if tries == 0:
+                            logger.warning(
+                                "Failed getting the list of docker instances after 5 tries"
+                            )
+                            break
+                    else:
+                        logger.warning("Failed to get the list of docker instances")
                         break
-                except BaseException:
-                    logger.warning("Failed to get the list of docker instances")
-                    break
 
         timestamp_str = datetime.datetime.now().strftime(timestamp_format)