From 5c8ad457f7a2af2f28da99c692346ae41e307e9b Mon Sep 17 00:00:00 2001 From: Dronakurl Date: Sun, 9 Feb 2025 01:07:31 +0100 Subject: [PATCH] fix: revert unwanted changes in cli.py --- .github/workflows/ci.yml | 17 +++++++---------- sahi/cli.py | 16 ++++++++-------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db88990..e1ebb2f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,17 +32,14 @@ jobs: prune-cache: false # For python 3.8 and 3.9, it does no suffice to install opencv-python-headless # https://itsmycode.com/importerror-libgl-so-1-cannot-open-shared-object-file-no-such-file-or-directory/ - - uses: awalsh128/cache-apt-pkgs-action@latest + - name: Cache apt packages + uses: actions/cache@v4 + if: ${{ env.ACT }} with: - packages: libgl1 - version: 1.0 - # - name: Cache apt packages - # uses: actions/cache@v4 - # with: - # path: /var/cache/apt - # key: apt-cache - # - name: Install libgl - # run: apt-get update && apt-get install -y libgl1 + path: /var/cache/apt + key: apt-cache + - name: Install libgl + run: sudo apt-get update && sudo apt-get install -y libgl1 - name: Test with python ${{ matrix.python-version }} run: uv run pytest - name: Test SAHI CLI diff --git a/sahi/cli.py b/sahi/cli.py index bc762ae4..dbc681cc 100644 --- a/sahi/cli.py +++ b/sahi/cli.py @@ -1,13 +1,13 @@ import fire -from . import __version__ as sahi_version -from .predict import predict, predict_fiftyone -from .scripts.coco2fiftyone import main as coco2fiftyone -from .scripts.coco2yolov5 import main as coco2yolov5 -from .scripts.coco_error_analysis import analyse -from .scripts.coco_evaluation import evaluate -from .scripts.slice_coco import slice -from .utils.import_utils import print_environment_info +from sahi import __version__ as sahi_version +from sahi.predict import predict, predict_fiftyone +from sahi.scripts.coco2fiftyone import main as coco2fiftyone +from sahi.scripts.coco2yolov5 import main as coco2yolov5 +from sahi.scripts.coco_error_analysis import analyse +from sahi.scripts.coco_evaluation import evaluate +from sahi.scripts.slice_coco import slice +from sahi.utils.import_utils import print_environment_info coco_app = { "evaluate": evaluate,