Merge branch 'ytdl-org:master' into master
This commit is contained in:
commit
8aac6a6702
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -368,7 +368,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
#-------- nose --------
|
#-------- nose --------
|
||||||
- name: Install nose for Python ${{ matrix.python-version }}
|
- name: Install nose for Python ${{ matrix.python-version }}
|
||||||
if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || matrix.python-version == '2.7' || matrix.python-version == '3.12' }}
|
if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || (matrix.python-impl == 'cpython' && (matrix.python-version == '2.7' || matrix.python-version == '3.12')) }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "$PATH"
|
echo "$PATH"
|
||||||
@ -380,7 +380,7 @@ jobs:
|
|||||||
[ "$py3ver" -ge 9 ] && nose=pynose || nose=nose
|
[ "$py3ver" -ge 9 ] && nose=pynose || nose=nose
|
||||||
$PIP -qq show $nose || $PIP install $nose
|
$PIP -qq show $nose || $PIP install $nose
|
||||||
- name: Install nose for other Python 2
|
- name: Install nose for other Python 2
|
||||||
if: ${{ matrix.python-impl == 'jython' || matrix.python-version == '2.6' }}
|
if: ${{ matrix.python-impl == 'jython' || (matrix.python-impl == 'cpython' && matrix.python-version == '2.6') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
|
# Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
|
||||||
|
Loading…
Reference in New Issue
Block a user