From a08b9df7e9410eea424d9fea61b2bec3beff44e9 Mon Sep 17 00:00:00 2001 From: Jaekwon Bang Date: Mon, 2 Jun 2025 16:32:55 +0900 Subject: [PATCH] Fix workflow waring message --- .github/workflows/publish-release.yml | 13 +++++-------- .github/workflows/pull-request.yml | 8 ++++---- requirements-dev.txt | 4 ++-- src/fosslight_binary/_binary_dao.py | 1 - src/fosslight_binary/binary_analysis.py | 1 - src/fosslight_binary/cli.py | 1 - 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e01bbda..8750279 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -83,27 +83,24 @@ jobs: - uses: actions/checkout@v3 with: ref: main - - name: Set up Python 3.8 + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.12' - name: Install dependencies run: | python -m pip install --upgrade pip pip install . - pip install pyinstaller==5.9.0 + pip install pyinstaller - name: Build with pyinstaller for ${{matrix.TARGET}} run: ${{matrix.CMD_BUILD}} - name: Upload Release Asset id: upload-release-asset - uses: actions/upload-release-asset@v1.0.1 + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.TOKEN }} with: - upload_url: ${{ github.event.release.upload_url }} asset_path: ./${{ matrix.OUT_FILE_NAME}} - asset_name: ${{ matrix.OUT_FILE_NAME}} - asset_content_type: ${{ matrix.ASSET_MIME}} deploy: runs-on: ubuntu-latest needs: build @@ -114,7 +111,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.12' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 95343a6..e0a20b7 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8] + python-version: [3.12.x] steps: - uses: actions/checkout@v3 @@ -37,13 +37,13 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: [3.8] + python-version: [3.12.x] steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.12.x' - name: Install & Run run: | python -m pip install --upgrade pip diff --git a/requirements-dev.txt b/requirements-dev.txt index 6bf06d2..23ce116 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ -pyinstaller==5.9.0 +pyinstaller>=6.0.0 tox pytest pytest-cov pytest-flake8 pytest-xdist -flake8==3.9.2 \ No newline at end of file +flake8 \ No newline at end of file diff --git a/src/fosslight_binary/_binary_dao.py b/src/fosslight_binary/_binary_dao.py index c70a96c..d115d63 100755 --- a/src/fosslight_binary/_binary_dao.py +++ b/src/fosslight_binary/_binary_dao.py @@ -142,7 +142,6 @@ def get_list_by_using_query(sql_query, columns): def disconnect_lge_bin_db(): - global conn, cur try: cur.close() conn.close() diff --git a/src/fosslight_binary/binary_analysis.py b/src/fosslight_binary/binary_analysis.py index ed5a9cd..5374de8 100755 --- a/src/fosslight_binary/binary_analysis.py +++ b/src/fosslight_binary/binary_analysis.py @@ -340,7 +340,6 @@ def check_binary(file_with_path): def error_occured(error_msg, exit=False, result_log={}, mode="Normal mode"): - global _error_logs _error_logs.append(error_msg) if exit: print_result_log(mode, success=False, result_log=result_log) diff --git a/src/fosslight_binary/cli.py b/src/fosslight_binary/cli.py index f80b469..7931b7c 100644 --- a/src/fosslight_binary/cli.py +++ b/src/fosslight_binary/cli.py @@ -32,7 +32,6 @@ def paginate_file(file_path): def main(): - global windows path_to_find_bin = "" path_to_exclude = [] output_dir = ""