diff --git a/.github/workflows/rocprofiler-compute-cdash.yml b/.github/workflows/rocprofiler-compute-cdash.yml index 669d73e425..82def8ef20 100644 --- a/.github/workflows/rocprofiler-compute-cdash.yml +++ b/.github/workflows/rocprofiler-compute-cdash.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' - name: Check Coverage File Exists working-directory: projects/rocprofiler-compute diff --git a/.github/workflows/rocprofiler-compute-tarball.yml b/.github/workflows/rocprofiler-compute-tarball.yml index fddd556531..701e7650f5 100644 --- a/.github/workflows/rocprofiler-compute-tarball.yml +++ b/.github/workflows/rocprofiler-compute-tarball.yml @@ -41,7 +41,7 @@ jobs: - name: Install Python uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' - name: Python dependency installs working-directory: projects/rocprofiler-compute run: python3 -m pip install -t${INSTALL_DIR}/python-libs -r requirements.txt diff --git a/projects/rocprofiler-compute/CMakeLists.txt b/projects/rocprofiler-compute/CMakeLists.txt index a1e0934bd2..18b5e79f3d 100644 --- a/projects/rocprofiler-compute/CMakeLists.txt +++ b/projects/rocprofiler-compute/CMakeLists.txt @@ -73,7 +73,7 @@ option(CHECK_PYTHON_DEPS "Verify necessary python dependencies" ON) if(CHECK_PYTHON_DEPS) # Python 3 is required message(STATUS "Detecting Python interpreter...") - find_package(Python3 3.8 COMPONENTS Interpreter REQUIRED) + find_package(Python3 3.9 COMPONENTS Interpreter REQUIRED) # Allow user-provided python search path if(DEFINED PYTHON_DEPS) @@ -96,11 +96,6 @@ if(CHECK_PYTHON_DEPS) if(${ARGV0} STREQUAL "pyyaml") set(PACKAGE "yaml") endif() - # Skip check for textual_fspicker - if(${package} STREQUAL "textual_fspicker") - message(STATUS "Skipping check for textual_fspicker") - return() - endif() execute_process( COMMAND ${Python3_EXECUTABLE} -c "import ${PACKAGE}" OUTPUT_QUIET diff --git a/projects/rocprofiler-compute/pyproject.toml b/projects/rocprofiler-compute/pyproject.toml index 64c1bacadb..8156571ab1 100644 --- a/projects/rocprofiler-compute/pyproject.toml +++ b/projects/rocprofiler-compute/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "rocprof_compute" -requires-python = ">=3.8" +requires-python = ">=3.9" [project.optional-dependencies] developer = [ diff --git a/projects/rocprofiler-compute/requirements.txt b/projects/rocprofiler-compute/requirements.txt index 464e6c3f54..fa5ea570c3 100644 --- a/projects/rocprofiler-compute/requirements.txt +++ b/projects/rocprofiler-compute/requirements.txt @@ -16,5 +16,5 @@ sqlalchemy>=2.0.42 tabulate textual textual_plotext -textual-fspicker +textual-fspicker>=0.4.3 tqdm diff --git a/projects/rocprofiler-compute/src/rocprof_compute_tui/analysis_tui.py b/projects/rocprofiler-compute/src/rocprof_compute_tui/analysis_tui.py index 9e21ef9193..62668e7361 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_tui/analysis_tui.py +++ b/projects/rocprofiler-compute/src/rocprof_compute_tui/analysis_tui.py @@ -25,8 +25,10 @@ import argparse import copy +from collections import OrderedDict +from collections.abc import Hashable from pathlib import Path -from typing import Any, Hashable, Optional, OrderedDict +from typing import Any, Optional import pandas as pd diff --git a/projects/rocprofiler-compute/src/rocprof_compute_tui/utils/tui_utils.py b/projects/rocprofiler-compute/src/rocprof_compute_tui/utils/tui_utils.py index 998063569b..9cc1f0e1e6 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_tui/utils/tui_utils.py +++ b/projects/rocprofiler-compute/src/rocprof_compute_tui/utils/tui_utils.py @@ -24,9 +24,10 @@ ############################################################################## import argparse import logging +from collections.abc import Hashable from datetime import datetime from enum import Enum -from typing import Any, Hashable, Optional +from typing import Any, Optional import pandas as pd from textual.widgets import TextArea diff --git a/projects/rocprofiler-compute/src/utils/utils.py b/projects/rocprofiler-compute/src/utils/utils.py index 2ae5020d7c..aa76fa8500 100644 --- a/projects/rocprofiler-compute/src/utils/utils.py +++ b/projects/rocprofiler-compute/src/utils/utils.py @@ -42,9 +42,10 @@ import tempfile import threading import time import uuid +from collections.abc import Generator from contextlib import contextmanager from pathlib import Path -from typing import Any, Dict, Generator, Optional, Union, cast +from typing import Any, Optional, Union, cast import pandas as pd import yaml @@ -767,7 +768,7 @@ def run_prof( if is_mode_live_attach: @contextmanager - def temporary_env(env_vars: Dict[str, str]) -> Generator[None, None, None]: + def temporary_env(env_vars: dict[str, str]) -> Generator[None, None, None]: """ Temporarily change the environment variable of this application. """