From 6c0cce8dffd697014a222f112940868e4453b92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 28 Sep 2024 16:48:21 +0200 Subject: [PATCH] [build] remove setuptools and requests version restrictions --- .github/workflows/executables.yml | 2 +- .github/workflows/tests.yml | 4 ++-- Dockerfile | 1 - gallery_dl/version.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/executables.yml b/.github/workflows/executables.yml index 71bb3728..3899aaf5 100644 --- a/.github/workflows/executables.yml +++ b/.github/workflows/executables.yml @@ -71,7 +71,7 @@ jobs: - name: Build executable run: | - pip install 'setuptools<71' 'requests<2.32' requests[socks] yt-dlp pyyaml ${{ matrix.python-packages }} pyinstaller + pip install requests requests[socks] yt-dlp pyyaml ${{ matrix.python-packages }} pyinstaller python ./scripts/pyinstaller.py --label '${{ env.LABEL }}' - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8a707a46..719855ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12.3", "pypy3.9"] + python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.9"] steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: 3.4|3.5) # don't install yt-dlp ;; - 3.6|3.7) + 3.6|3.7|3.8) # install from PyPI pip install yt-dlp ;; diff --git a/Dockerfile b/Dockerfile index 236fc76f..757b5363 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN : \ && python3 -B -m pip --no-cache-dir --no-input --disable-pip-version-check install -U \ https://github.com/mikf/gallery-dl/archive/refs/heads/master.tar.gz \ yt-dlp \ - 'requests<2.32' \ && ( rm -rf /root/.cache/pip || true ) \ && ( find /usr/local/lib/python3.*/site-packages/setuptools -name __pycache__ -exec rm -rf {} + || true ) \ && ( find /usr/local/lib/python3.*/site-packages/wheel -name __pycache__ -exec rm -rf {} + || true ) \ diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 513da419..3844fd97 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,5 +6,5 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.27.5" +__version__ = "1.27.6-dev" __variant__ = None