Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into girlsreleased
Browse files Browse the repository at this point in the history
  • Loading branch information
missionfloyd committed Dec 25, 2024
2 parents 3b1c630 + a3fb03c commit a025a18
Show file tree
Hide file tree
Showing 194 changed files with 11,098 additions and 2,501 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/executables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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[default] pyyaml ${{ matrix.python-packages }} pyinstaller
python ./scripts/pyinstaller.py --label '${{ env.LABEL }}'
- uses: actions/upload-artifact@v4
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: tests
name: Tests

on:
workflow_dispatch:
Expand All @@ -10,13 +10,23 @@ on:
- master

jobs:
build:
test:

runs-on: ubuntu-20.04
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"
- "3.13"
- "pypy3.9"

steps:
- uses: actions/checkout@v4
Expand All @@ -43,7 +53,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
;;
Expand Down
279 changes: 279 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ RUN : \
pip \
&& 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' \
yt-dlp[default] \
&& ( 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 ) \
Expand Down
8 changes: 5 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ pip_ as well:

.. code:: bash
python3 -m pip install -U -I --no-deps --no-cache-dir https://github.com/mikf/gallery-dl/archive/master.tar.gz
python3 -m pip install -U --force-reinstall --no-deps https://github.com/mikf/gallery-dl/archive/master.tar.gz
Omit :code:`--no-deps` if Requests_ hasn't been installed yet.

Note: Windows users should use :code:`py -3` instead of :code:`python3`.

Expand All @@ -74,9 +76,9 @@ Standalone Executable
Prebuilt executable files with a Python interpreter and
required Python packages included are available for

- `Windows <https://github.com/mikf/gallery-dl/releases/download/v1.27.4/gallery-dl.exe>`__
- `Windows <https://github.com/mikf/gallery-dl/releases/download/v1.28.2/gallery-dl.exe>`__
(Requires `Microsoft Visual C++ Redistributable Package (x86) <https://aka.ms/vs/17/release/vc_redist.x86.exe>`__)
- `Linux <https://github.com/mikf/gallery-dl/releases/download/v1.27.4/gallery-dl.bin>`__
- `Linux <https://github.com/mikf/gallery-dl/releases/download/v1.28.2/gallery-dl.bin>`__


Nightly Builds
Expand Down
Loading

0 comments on commit a025a18

Please sign in to comment.