From 4875e755d0943ca7302d6f44753a5887a9620079 Mon Sep 17 00:00:00 2001 From: Fatpandac Date: Thu, 25 May 2023 16:10:44 +0800 Subject: [PATCH] chore: update the dependency of hackcqooc --- .github/workflows/auto-release.yml | 14 ++++++++++---- pyproject.toml | 6 +++--- requirements-dev.lock | 17 ++++++++++------- requirements.lock | 14 ++++++++------ requirements.txt | 23 +++-------------------- 5 files changed, 34 insertions(+), 40 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 030cfcc..b256a5a 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -27,19 +27,22 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.8 - name: install pyinstaller run: | pip3 install pyinstaller # 可替换为自己项目的编译命令 - name: setup env run: | + pip install --upgrade pip pip3 install -r requirements.txt + - name: build app run: | pyinstaller src/app.py -F -w --add-data "assets;assets" --icon metadata/WinIcon.png + - name: build package run: | cd dist @@ -60,19 +63,22 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.7 + - name: Set up Python uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.8 - name: install pyinstaller run: | pip3 install pyinstaller # 可替换为自己项目的编译命令 - name: setup env run: | + pip install --upgrade pip pip3 install -r requirements.txt + - name: build app run: | pyinstaller src/app.py -F -w --add-data "assets:assets" --icon metadata/MacIcon.png + - name: build package run: | cd dist diff --git a/pyproject.toml b/pyproject.toml index 4e2d508..cc9372a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "fuck_cqooc" -version = "v0.0.4-beta" +version = "v0.0.5-beta" description = "一个重庆高校在线开放课程平台刷课工具。" authors = [ { name = "Fatpandac", email = "i@fatpandac.com" } @@ -8,7 +8,7 @@ authors = [ readme = "README.md" requires-python = ">= 3.8" license = { text = "MIT" } -dependencies = ["hackcqooc~=0.0.8", "flet~=0.7.1", "pillow~=9.5.0"] +dependencies = ["hackcqooc~=0.0.8", "flet~=0.7.1", "pipreqs~=0.4.13"] [build-system] requires = ["hatchling"] @@ -16,7 +16,7 @@ build-backend = "hatchling.build" [tool.rye] managed = true -dev-dependencies = ["pre-commit~=3.3.1"] +dev-dependencies = ["pre-commit~=3.3.1", "pillow~=9.5.0"] [tool.black] line-length = 79 diff --git a/requirements-dev.lock b/requirements-dev.lock index 05650f9..bbd0619 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -13,11 +13,12 @@ certifi==2023.5.7 cfgv==3.3.1 charset-normalizer==3.1.0 distlib==0.3.6 +docopt==0.6.2 filelock==3.12.0 -flet==0.7.1 -flet-core==0.7.1 +flet==0.7.4 +flet-core==0.7.4 h11==0.14.0 -hackcqooc==0.0.8 +hackcqooc==0.0.10 httpcore==0.16.3 httpx==0.23.3 identify==2.5.24 @@ -27,8 +28,9 @@ nodeenv==1.8.0 oauthlib==3.2.2 packaging==23.1 pillow==9.5.0 +pipreqs==0.4.13 platformdirs==3.5.1 -pre-commit==3.3.1 +pre-commit==3.3.2 pyjsparser==2.7.1 pyyaml==6.0 repath==0.9.0 @@ -36,12 +38,13 @@ requests==2.30.0 rfc3986==1.5.0 six==1.16.0 sniffio==1.3.0 -tzlocal==5.0 +tzlocal==5.0.1 urllib3==2.0.2 virtualenv==20.23.0 watchdog==2.3.1 -websocket-client==1.5.1 +websocket-client==1.5.2 websockets==10.4 +yarg==0.1.9 # The following packages are considered to be unsafe in a requirements file: -setuptools==67.7.2 +setuptools==67.8.0 diff --git a/requirements.lock b/requirements.lock index 0e9cbc7..04fc842 100644 --- a/requirements.lock +++ b/requirements.lock @@ -11,25 +11,27 @@ anyio==3.6.2 backports-zoneinfo==0.2.1 certifi==2023.5.7 charset-normalizer==3.1.0 -flet==0.7.1 -flet-core==0.7.1 +docopt==0.6.2 +flet==0.7.4 +flet-core==0.7.4 h11==0.14.0 -hackcqooc==0.0.8 +hackcqooc==0.0.10 httpcore==0.16.3 httpx==0.23.3 idna==3.4 js2py==0.74 oauthlib==3.2.2 packaging==23.1 -pillow==9.5.0 +pipreqs==0.4.13 pyjsparser==2.7.1 repath==0.9.0 requests==2.30.0 rfc3986==1.5.0 six==1.16.0 sniffio==1.3.0 -tzlocal==5.0 +tzlocal==5.0.1 urllib3==2.0.2 watchdog==2.3.1 -websocket-client==1.5.1 +websocket-client==1.5.2 websockets==10.4 +yarg==0.1.9 diff --git a/requirements.txt b/requirements.txt index 205235d..eb93c7c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,3 @@ --i https://pypi.org/simple -beartype==0.11.0 ; python_full_version >= '3.7.0' -certifi==2022.9.24 ; python_version >= '3.6' -charset-normalizer==2.1.1 ; python_full_version >= '3.6.0' -flet==0.1.65 -hackcqooc==0.0.8 -idna==3.4 ; python_version >= '3.5' -js2py==0.74 -oauthlib==3.2.2 ; python_version >= '3.6' -pillow==9.3.0 -pyjsparser==2.7.1 -pytz-deprecation-shim==0.1.0.post0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -repath==0.9.0 -requests==2.28.1 ; python_version >= '3.7' and python_version < '4' -six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2' -tzdata==2022.6 ; platform_system == 'Windows' -tzlocal==4.2 ; python_version >= '3.6' -urllib3==1.26.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -watchdog==2.1.9 ; python_version >= '3.6' -websocket-client==1.4.2 ; python_version >= '3.7' +flet==0.7.4 +hackcqooc==0.0.10 +pillow==9.5.0