From a071d0d2c49716cc0f3f3a296723960b0026ed71 Mon Sep 17 00:00:00 2001 From: None <62809003+Arrowar@users.noreply.github.com> Date: Tue, 13 May 2025 11:37:56 +0200 Subject: [PATCH] Bump v3.0.5 --- .github/workflows/build-dev.yml | 104 --------------------------- .github/workflows/build.yml | 24 ++----- StreamingCommunity/Upload/version.py | 2 +- setup.py | 2 +- 4 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 .github/workflows/build-dev.yml diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml deleted file mode 100644 index e4e4855..0000000 --- a/.github/workflows/build-dev.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: Build Dev Branch - -on: - workflow_dispatch: - push: - branches: - - "dev" - -jobs: - build: - strategy: - matrix: - include: - - os: windows-latest - artifact_name: dev_StreamingCommunity_win - executable: dev_StreamingCommunity_win.exe - separator: ';' - - - os: macos-latest - artifact_name: dev_StreamingCommunity_mac - executable: dev_StreamingCommunity_mac - separator: ':' - - - os: ubuntu-latest - artifact_name: dev_StreamingCommunity_linux_latest - executable: dev_StreamingCommunity_linux_latest - separator: ':' - - - os: ubuntu-22.04 - artifact_name: dev_StreamingCommunity_linux_previous - executable: dev_StreamingCommunity_linux_previous - separator: ':' - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Get the latest release tag - id: get_latest_release - shell: bash - run: | - latest_tag=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r .tag_name) - echo "latest_tag=$latest_tag" >> $GITHUB_ENV - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade certifi - python -m pip install -r requirements.txt - python -m pip install pyinstaller - - - name: Build executable with PyInstaller - shell: bash - run: | - # Get certifi certificate path - CERT_PATH=$(python -c "import certifi; print(certifi.where())") - - if [[ "${{ matrix.os }}" == "windows-latest" ]]; then - CERT_DATA="${CERT_PATH};certifi" - SC_DATA="StreamingCommunity;StreamingCommunity" - else - CERT_DATA="${CERT_PATH}:certifi" - SC_DATA="StreamingCommunity:StreamingCommunity" - fi - - pyinstaller --onefile --hidden-import=pycryptodomex --hidden-import=ua_generator \ - --hidden-import=qbittorrentapi --hidden-import=qbittorrent \ - --hidden-import=bs4 --hidden-import=httpx --hidden-import=rich --hidden-import=tqdm \ - --hidden-import=m3u8 --hidden-import=psutil --hidden-import=unidecode \ - --hidden-import=jsbeautifier --hidden-import=jsbeautifier.core \ - --hidden-import=jsbeautifier.javascript --hidden-import=jsbeautifier.javascript.beautifier \ - --hidden-import=jsbeautifier.unpackers --hidden-import=jsbeautifier.unpackers.packer \ - --hidden-import=jsbeautifier.unpackers.javascriptobfuscator \ - --hidden-import=jsbeautifier.unpackers.myobfuscate \ - --hidden-import=jsbeautifier.unpackers.urlencode \ - --hidden-import=jsbeautifier.unpackers.meshim \ - --hidden-import=editorconfig --hidden-import=editorconfig.handlers \ - --hidden-import=six --hidden-import=pathvalidate \ - --hidden-import=Cryptodome.Cipher --hidden-import=Cryptodome.Cipher.AES \ - --hidden-import=Cryptodome.Util --hidden-import=Cryptodome.Util.Padding \ - --hidden-import=Cryptodome.Random \ - --hidden-import=telebot \ - --additional-hooks-dir=pyinstaller/hooks \ - --add-data="$CERT_DATA" \ - --add-data="$SC_DATA" \ - --name=${{ matrix.artifact_name }} test_run.py - - - name: Upload executable to latest release - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ env.latest_tag }} - files: dist/${{ matrix.executable }} - prerelease: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6b34db..6f58f25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: build: if: startsWith(github.ref_name, 'v') || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish_pypi == 'false') - + strategy: matrix: include: @@ -59,17 +59,17 @@ jobs: artifact_name: StreamingCommunity_win executable: StreamingCommunity_win.exe separator: ';' - + - os: macos-latest artifact_name: StreamingCommunity_mac executable: StreamingCommunity_mac separator: ':' - + - os: ubuntu-latest artifact_name: StreamingCommunity_linux_latest executable: StreamingCommunity_linux_latest separator: ':' - + - os: ubuntu-22.04 artifact_name: StreamingCommunity_linux_previous executable: StreamingCommunity_linux_previous @@ -105,17 +105,6 @@ jobs: - name: Build executable with PyInstaller shell: bash run: | - # Get certifi certificate path - CERT_PATH=$(python -c "import certifi; print(certifi.where())") - - if [[ "${{ matrix.os }}" == "windows-latest" ]]; then - CERT_DATA="${CERT_PATH};certifi" - SC_DATA="StreamingCommunity;StreamingCommunity" - else - CERT_DATA="${CERT_PATH}:certifi" - SC_DATA="StreamingCommunity:StreamingCommunity" - fi - pyinstaller --onefile --hidden-import=pycryptodomex --hidden-import=ua_generator \ --hidden-import=qbittorrentapi --hidden-import=qbittorrent \ --hidden-import=bs4 --hidden-import=httpx --hidden-import=rich --hidden-import=tqdm \ @@ -134,8 +123,7 @@ jobs: --hidden-import=Cryptodome.Random \ --hidden-import=telebot \ --additional-hooks-dir=pyinstaller/hooks \ - --add-data="$CERT_DATA" \ - --add-data="$SC_DATA" \ + --add-data "StreamingCommunity${{ matrix.separator }}StreamingCommunity" \ --name=${{ matrix.artifact_name }} test_run.py - name: Upload executable @@ -150,4 +138,4 @@ jobs: tag_name: ${{ env.latest_tag }} files: dist/${{ matrix.executable }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/StreamingCommunity/Upload/version.py b/StreamingCommunity/Upload/version.py index 8d4b8dc..af0a5dc 100644 --- a/StreamingCommunity/Upload/version.py +++ b/StreamingCommunity/Upload/version.py @@ -1,5 +1,5 @@ __title__ = 'StreamingCommunity' -__version__ = '3.0.4' +__version__ = '3.0.5' __author__ = 'Arrowar' __description__ = 'A command-line program to download film' __copyright__ = 'Copyright 2024' diff --git a/setup.py b/setup.py index 863f2f3..5e5beb5 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ with open(os.path.join(os.path.dirname(__file__), "requirements.txt"), "r", enco setup( name="StreamingCommunity", - version="3.0.4", + version="3.0.5", long_description=read_readme(), long_description_content_type="text/markdown", author="Lovi-0",