mirror of
https://github.com/yt-dlp/yt-dlp
synced 2024-11-16 07:48:01 +01:00
Revert "[build] Build Windows x86 version with py3.8"
This reverts commit aa75e51f99
.
See #390
This is being reverted instead of modified due to #388
This commit is contained in:
parent
aa75e51f99
commit
b5c5d84f60
5 changed files with 17 additions and 14 deletions
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
@ -137,15 +137,15 @@ jobs:
|
|||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up Python 32-Bit
|
||||
- name: Set up Python 3.4.4 32-Bit
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.8'
|
||||
python-version: '3.4.4'
|
||||
architecture: 'x86'
|
||||
- name: Upgrade pip and enable wheel support
|
||||
run: python -m pip install --upgrade pip setuptools wheel
|
||||
- name: Install Requirements
|
||||
run: pip install pyinstaller mutagen pycryptodome
|
||||
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
|
||||
- name: Bump version
|
||||
id: bump_version
|
||||
run: python devscripts/update-version.py
|
||||
|
|
6
.github/workflows/core.yml
vendored
6
.github/workflows/core.yml
vendored
|
@ -9,13 +9,11 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
# py3.9 is in quick-test
|
||||
python-version: [3.7, 3.8, pypy-3.6, pypy-3.7]
|
||||
python-version: [3.6, 3.7, 3.8, 3.9, 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.6
|
||||
python-version: 3.4 # Windows x86 build is still in 3.4
|
||||
run-tests-ext: bat
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
|
4
.github/workflows/download.yml
vendored
4
.github/workflows/download.yml
vendored
|
@ -9,11 +9,11 @@ jobs:
|
|||
fail-fast: true
|
||||
matrix:
|
||||
os: [ubuntu-18.04]
|
||||
python-version: [3.7, 3.8, 3.9, pypy-3.6, pypy-3.7]
|
||||
python-version: [3.6, 3.7, 3.8, 3.9, pypy-3.6, pypy-3.7]
|
||||
run-tests-ext: [sh]
|
||||
include:
|
||||
- os: windows-latest
|
||||
python-version: 3.6
|
||||
python-version: 3.4 # Windows x86 build is still in 3.4
|
||||
run-tests-ext: bat
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
|
|
@ -472,7 +472,8 @@ class YoutubeDL(object):
|
|||
|
||||
if sys.version_info < (3, 6):
|
||||
self.report_warning(
|
||||
'Python version %d.%d is not supported! Please update to Python 3.6 or above' % sys.version_info[:2])
|
||||
'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])
|
||||
|
||||
def check_deprecated(param, option, suggestion):
|
||||
if self.params.get(param) is not None:
|
||||
|
|
|
@ -89,9 +89,13 @@ def run_update(ydl):
|
|||
|
||||
err = None
|
||||
if isinstance(globals().get('__loader__'), zipimporter):
|
||||
pass
|
||||
# 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]
|
||||
elif hasattr(sys, 'frozen'):
|
||||
pass
|
||||
# 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'
|
||||
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:
|
||||
|
|
Loading…
Reference in a new issue