mirror of https://github.com/streamlink/streamlink
setup: update requests version >=2.26.0 and makeinstaller.sh
revert https://github.com/streamlink/streamlink/pull/3880
This commit is contained in:
parent
28c99c3d53
commit
ac47d04e7c
|
@ -284,8 +284,7 @@ Name Notes
|
|||
|
||||
**Automatically installed by the setup script**
|
||||
--------------------------------------------------------------------------------
|
||||
`python-requests`_ At least version **2.26.0** |br|
|
||||
Temporarily pinpointed to **2.25.1** on Windows (see `#3880`_)
|
||||
`python-requests`_ At least version **2.26.0**
|
||||
`pycryptodome`_ Required to play some encrypted streams
|
||||
`iso-639`_ Used for localization settings, provides language information
|
||||
`iso3166`_ Used for localization settings, provides country information
|
||||
|
@ -313,7 +312,7 @@ With these two environment variables it is possible to use `pycrypto`_ instead o
|
|||
|
||||
.. _Python: https://www.python.org/
|
||||
.. _python-setuptools: https://pypi.org/project/setuptools/
|
||||
.. _python-requests: https://requests.readthedocs.io/en/master/
|
||||
.. _python-requests: https://docs.python-requests.org/en/master/
|
||||
.. _RTMPDump: https://rtmpdump.mplayerhq.hu/
|
||||
.. _pycountry: https://pypi.org/project/pycountry/
|
||||
.. _pycrypto: https://www.dlitz.net/software/pycrypto/
|
||||
|
@ -324,7 +323,6 @@ With these two environment variables it is possible to use `pycrypto`_ instead o
|
|||
.. _isodate: https://pypi.org/project/isodate/
|
||||
.. _PySocks: https://github.com/Anorov/PySocks
|
||||
.. _websocket-client: https://pypi.org/project/websocket-client/
|
||||
.. _#3880: https://github.com/streamlink/streamlink/pull/3880
|
||||
|
||||
|
||||
Windows binaries
|
||||
|
|
|
@ -92,16 +92,16 @@ format=bundled
|
|||
packages=pkg_resources
|
||||
iso639
|
||||
pypi_wheels=certifi==2021.5.30
|
||||
chardet==4.0.0
|
||||
idna==2.10
|
||||
charset-normalizer==2.0.4
|
||||
idna==3.2
|
||||
iso3166==1.0.1
|
||||
isodate==0.6.0
|
||||
pycryptodome==3.10.1
|
||||
PySocks==1.7.1
|
||||
requests==2.25.1
|
||||
requests==2.26.0
|
||||
six==1.16.0
|
||||
urllib3==1.26.6
|
||||
websocket-client==1.1.0
|
||||
websocket-client==1.2.1
|
||||
|
||||
files=${ROOT}/win32/THIRD-PARTY.txt > \$INSTDIR
|
||||
${ROOT}/build/lib/streamlink > \$INSTDIR\pkgs
|
||||
|
|
5
setup.py
5
setup.py
|
@ -10,10 +10,7 @@ import versioneer
|
|||
|
||||
data_files = []
|
||||
deps = [
|
||||
# Temporarily set requests to 2.25.1 on Windows to fix issues with randomly failing tests
|
||||
# Don't force an older requests version on non-Windows systems due to packaging reasons
|
||||
"requests>=2.26.0,<3.0 ; platform_system!='Windows'",
|
||||
"requests==2.25.1 ; platform_system=='Windows'",
|
||||
"requests>=2.26.0,<3.0",
|
||||
"isodate",
|
||||
"websocket-client>=0.58.0",
|
||||
# Support for SOCKS proxies
|
||||
|
|
Loading…
Reference in New Issue