diff options
| -rw-r--r-- | .github/workflows/build.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/core.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/download.yml | 4 | ||||
| -rw-r--r-- | test/test_unicode_literals.py.disabled (renamed from test/test_unicode_literals.py) | 0 | ||||
| -rw-r--r-- | yt_dlp/YoutubeDL.py | 3 | ||||
| -rw-r--r-- | yt_dlp/update.py | 8 |
6 files changed, 14 insertions, 17 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4321da0d..6c9eed6f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,15 +137,15 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.4.4 32-Bit + - name: Set up Python 32-Bit uses: actions/setup-python@v2 with: - python-version: '3.4.4' + python-version: '3.8' architecture: 'x86' - name: Upgrade pip and enable wheel support - run: python -m pip install pip==19.1.1 setuptools==43.0.0 wheel==0.33.6 - - name: Install Requirements for 32 Bit - run: pip install pyinstaller==3.5 mutagen==1.42.0 pycryptodome==3.9.4 pefile==2019.4.18 + run: python -m pip install --upgrade pip setuptools wheel + - name: Install Requirements + run: pip install pyinstaller mutagen pycryptodome - name: Bump version id: bump_version run: python devscripts/update-version.py diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index abf7739eb..be932275a 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -9,11 +9,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-18.04] - python-version: [3.6, 3.7, 3.8, 3.9, pypy-3.6, pypy-3.7] + # py3.9 is in quick-test + python-version: [3.7, 3.8, pypy-3.6, pypy-3.7] run-tests-ext: [sh] include: + # atleast one of the tests must be in windows - os: windows-latest - python-version: 3.4 # Windows x86 build is still in 3.4 + python-version: 3.6 run-tests-ext: bat steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/download.yml b/.github/workflows/download.yml index 6b24ddd6b..9e650d2dc 100644 --- a/.github/workflows/download.yml +++ b/.github/workflows/download.yml @@ -9,11 +9,11 @@ jobs: fail-fast: true matrix: os: [ubuntu-18.04] - python-version: [3.6, 3.7, 3.8, 3.9, pypy-3.6, pypy-3.7] + python-version: [3.7, 3.8, 3.9, pypy-3.6, pypy-3.7] run-tests-ext: [sh] include: - os: windows-latest - python-version: 3.4 # Windows x86 build is still in 3.4 + python-version: 3.6 run-tests-ext: bat steps: - uses: actions/checkout@v2 diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py.disabled index 6c1b7ec91..6c1b7ec91 100644 --- a/test/test_unicode_literals.py +++ b/test/test_unicode_literals.py.disabled diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index ad96cebcd..92c078a39 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -472,8 +472,7 @@ class YoutubeDL(object): if sys.version_info < (3, 6): self.report_warning( - 'Support for Python version %d.%d have been deprecated and will break in future versions of yt-dlp! ' - 'Update to Python 3.6 or above' % sys.version_info[:2]) + 'Python version %d.%d is not supported! Please update to Python 3.6 or above' % sys.version_info[:2]) def check_deprecated(param, option, suggestion): if self.params.get(param) is not None: diff --git a/yt_dlp/update.py b/yt_dlp/update.py index c49c78d4b..d3681b832 100644 --- a/yt_dlp/update.py +++ b/yt_dlp/update.py @@ -89,13 +89,9 @@ def run_update(ydl): err = None if isinstance(globals().get('__loader__'), zipimporter): - # We only support python 3.6 or above - if sys.version_info < (3, 6): - err = 'This is the last release of yt-dlp for Python version %d.%d! Please update to Python 3.6 or above' % sys.version_info[:2] + pass elif hasattr(sys, 'frozen'): - # Python 3.6 supports only vista and above - if sys.getwindowsversion()[0] < 6: - err = 'This is the last release of yt-dlp for your version of Windows. Please update to Windows Vista or above' + pass else: err = 'It looks like you installed yt-dlp with a package manager, pip, setup.py or a tarball. Please use that to update' if err: |