From 55f1d4758e481863d7fab48731b27e41d8c18085 Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Sat, 12 Jul 2025 17:52:24 +0800 Subject: [PATCH] Update both version Update both version * Edit CI files * minimum from 3.9 to 3.10 --- .../file_automation_dev_python3_10.yml | 2 +- .../file_automation_dev_python3_11.yml | 2 +- ...yml => file_automation_dev_python3_12.yml} | 6 +-- .../file_automation_dev_python3_8.yml | 33 -------------- .../file_automation_stable_python3_10.yml | 2 +- .../file_automation_stable_python3_11.yml | 2 +- ... => file_automation_stable_python3_12.yml} | 6 +-- .../file_automation_stable_python3_8.yml | 33 -------------- automation_file/gui/__init__.py | 0 automation_file/gui/main_widget.py | 20 --------- automation_file/gui/main_window.py | 44 ------------------- pyproject.toml | 10 ++--- dev.toml => stable.toml | 10 ++--- 13 files changed, 20 insertions(+), 150 deletions(-) rename .github/workflows/{file_automation_dev_python3_9.yml => file_automation_dev_python3_12.yml} (88%) delete mode 100644 .github/workflows/file_automation_dev_python3_8.yml rename .github/workflows/{file_automation_stable_python3_9.yml => file_automation_stable_python3_12.yml} (88%) delete mode 100644 .github/workflows/file_automation_stable_python3_8.yml delete mode 100644 automation_file/gui/__init__.py delete mode 100644 automation_file/gui/main_widget.py delete mode 100644 automation_file/gui/main_window.py rename dev.toml => stable.toml (84%) diff --git a/.github/workflows/file_automation_dev_python3_10.yml b/.github/workflows/file_automation_dev_python3_10.yml index 17b56a1..bbd2157 100644 --- a/.github/workflows/file_automation_dev_python3_10.yml +++ b/.github/workflows/file_automation_dev_python3_10.yml @@ -13,7 +13,7 @@ permissions: jobs: build_dev_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/file_automation_dev_python3_11.yml b/.github/workflows/file_automation_dev_python3_11.yml index 574c706..b9f397a 100644 --- a/.github/workflows/file_automation_dev_python3_11.yml +++ b/.github/workflows/file_automation_dev_python3_11.yml @@ -13,7 +13,7 @@ permissions: jobs: build_dev_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/file_automation_dev_python3_9.yml b/.github/workflows/file_automation_dev_python3_12.yml similarity index 88% rename from .github/workflows/file_automation_dev_python3_9.yml rename to .github/workflows/file_automation_dev_python3_12.yml index 7049c2b..12fde69 100644 --- a/.github/workflows/file_automation_dev_python3_9.yml +++ b/.github/workflows/file_automation_dev_python3_12.yml @@ -13,14 +13,14 @@ permissions: jobs: build_dev_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip wheel diff --git a/.github/workflows/file_automation_dev_python3_8.yml b/.github/workflows/file_automation_dev_python3_8.yml deleted file mode 100644 index 7f5c91a..0000000 --- a/.github/workflows/file_automation_dev_python3_8.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: FileAutomation Dev Python3.8 - -on: - push: - branches: [ "dev" ] - pull_request: - branches: [ "dev" ] - schedule: - - cron: "0 3 * * *" - -permissions: - contents: read - -jobs: - build_dev_version: - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v3 - with: - python-version: "3.8" - - name: Install dependencies - run: | - python -m pip install --upgrade pip wheel - pip install -r dev_requirements.txt - - name: Dir Module Test - run: python ./tests/unit_test/local/dir/dir_test.py - - name: File Module Test - run: python ./tests/unit_test/local/file/test_file.py - - name: Zip Module Test - run: python ./tests/unit_test/local/zip/zip_test.py \ No newline at end of file diff --git a/.github/workflows/file_automation_stable_python3_10.yml b/.github/workflows/file_automation_stable_python3_10.yml index b619a7c..8c844f3 100644 --- a/.github/workflows/file_automation_stable_python3_10.yml +++ b/.github/workflows/file_automation_stable_python3_10.yml @@ -13,7 +13,7 @@ permissions: jobs: build_stable_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/file_automation_stable_python3_11.yml b/.github/workflows/file_automation_stable_python3_11.yml index fa2a532..ed8002b 100644 --- a/.github/workflows/file_automation_stable_python3_11.yml +++ b/.github/workflows/file_automation_stable_python3_11.yml @@ -13,7 +13,7 @@ permissions: jobs: build_stable_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/file_automation_stable_python3_9.yml b/.github/workflows/file_automation_stable_python3_12.yml similarity index 88% rename from .github/workflows/file_automation_stable_python3_9.yml rename to .github/workflows/file_automation_stable_python3_12.yml index e816f5e..8227e50 100644 --- a/.github/workflows/file_automation_stable_python3_9.yml +++ b/.github/workflows/file_automation_stable_python3_12.yml @@ -13,14 +13,14 @@ permissions: jobs: build_stable_version: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 + - name: Set up Python 3.12 uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip wheel diff --git a/.github/workflows/file_automation_stable_python3_8.yml b/.github/workflows/file_automation_stable_python3_8.yml deleted file mode 100644 index 4d927a5..0000000 --- a/.github/workflows/file_automation_stable_python3_8.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: FileAutomation Stable Python3.8 - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - - cron: "0 3 * * *" - -permissions: - contents: read - -jobs: - build_stable_version: - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v3 - with: - python-version: "3.8" - - name: Install dependencies - run: | - python -m pip install --upgrade pip wheel - pip install -r requirements.txt - - name: Dir Module Test - run: python ./tests/unit_test/local/dir/dir_test.py - - name: File Module Test - run: python ./tests/unit_test/local/file/test_file.py - - name: Zip Module Test - run: python ./tests/unit_test/local/zip/zip_test.py diff --git a/automation_file/gui/__init__.py b/automation_file/gui/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/automation_file/gui/main_widget.py b/automation_file/gui/main_widget.py deleted file mode 100644 index 999b0e7..0000000 --- a/automation_file/gui/main_widget.py +++ /dev/null @@ -1,20 +0,0 @@ -from __future__ import annotations - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from je_auto_control.gui.main_window import AutoControlGUI - -from PySide6.QtWidgets import QWidget, QGridLayout - - -class AutoControlWidget(QWidget): - - def __init__(self, main_ui: AutoControlGUI): - super().__init__() - # Variable - self.main_ui = main_ui - # UI component - # Grid layout - self.grid_layout = QGridLayout() - self.setLayout(self.grid_layout) diff --git a/automation_file/gui/main_window.py b/automation_file/gui/main_window.py deleted file mode 100644 index 791490f..0000000 --- a/automation_file/gui/main_window.py +++ /dev/null @@ -1,44 +0,0 @@ -import os -import sys -from pathlib import Path - -from PySide6.QtCore import QCoreApplication, QTimer -from PySide6.QtGui import QIcon -from PySide6.QtWidgets import QMainWindow, QApplication -from qt_material import apply_stylesheet - -from je_auto_control.gui.main_widget import AutoControlWidget - - -class AutoControlGUI(QMainWindow): - - def __init__(self, debug_mode: bool = False): - super().__init__() - self.debug_mode = debug_mode - self.central_widget = AutoControlWidget(self) - self.setCentralWidget(self.central_widget) - self.setWindowTitle("AutoControlGUI") - # Set Icon - self.icon_path = Path(os.getcwd() + "/je_driver_icon.ico") - self.icon = QIcon(str(self.icon_path)) - if self.icon.isNull() is False: - self.setWindowIcon(self.icon) - if self.debug_mode: - close_timer = QTimer(self) - close_timer.setInterval(10000) - close_timer.timeout.connect(self.debug_close) - close_timer.start() - - @classmethod - def debug_close(cls): - sys.exit(0) - - -def start_autocontrol_gui(debug_mode: bool = False) -> None: - autocontrol_gui = QCoreApplication.instance() - if autocontrol_gui is None: - autocontrol_gui = QApplication(sys.argv) - window = AutoControlGUI(debug_mode) - apply_stylesheet(autocontrol_gui, theme='dark_amber.xml') - window.showMaximized() - sys.exit(autocontrol_gui.exec()) diff --git a/pyproject.toml b/pyproject.toml index 0134409..7b2a596 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,15 +5,15 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_file" -version = "0.0.26" +name = "automation_file_dev" +version = "0.0.29" authors = [ { name = "JE-Chen", email = "zenmailman@gmail.com" }, ] description = "" readme = { file = "README.md", content-type = "text/markdown" } -requires-python = ">=3.9" -license-files = ["LICENSE"] +requires-python = ">=3.10" +license = { text = "MIT" } dependencies = [ "google-api-python-client", "google-auth-httplib2", @@ -22,7 +22,7 @@ dependencies = [ "tqdm" ] classifiers = [ - "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Development Status :: 2 - Pre-Alpha", "Environment :: Win32 (MS Windows)", "Environment :: MacOS X", diff --git a/dev.toml b/stable.toml similarity index 84% rename from dev.toml rename to stable.toml index cdcba83..1bee462 100644 --- a/dev.toml +++ b/stable.toml @@ -5,15 +5,15 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_file_dev" -version = "0.0.28" +name = "automation_file" +version = "0.0.27" authors = [ { name = "JE-Chen", email = "zenmailman@gmail.com" }, ] description = "" readme = { file = "README.md", content-type = "text/markdown" } -requires-python = ">=3.9" -license = { text = "MIT" } +requires-python = ">=3.10" +license-files = ["LICENSE"] dependencies = [ "google-api-python-client", "google-auth-httplib2", @@ -22,7 +22,7 @@ dependencies = [ "tqdm" ] classifiers = [ - "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Development Status :: 2 - Pre-Alpha", "Environment :: Win32 (MS Windows)", "Environment :: MacOS X",