Skip to content

Commit ac47d04

Browse files
back-tobastimeyer
authored andcommitted
setup: update requests version >=2.26.0 and makeinstaller.sh
revert #3880
1 parent 28c99c3 commit ac47d04

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

docs/install.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ Name Notes
284284

285285
**Automatically installed by the setup script**
286286
--------------------------------------------------------------------------------
287-
`python-requests`_ At least version **2.26.0** |br|
288-
Temporarily pinpointed to **2.25.1** on Windows (see `#3880`_)
287+
`python-requests`_ At least version **2.26.0**
289288
`pycryptodome`_ Required to play some encrypted streams
290289
`iso-639`_ Used for localization settings, provides language information
291290
`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
313312

314313
.. _Python: https://www.python.org/
315314
.. _python-setuptools: https://pypi.org/project/setuptools/
316-
.. _python-requests: https://requests.readthedocs.io/en/master/
315+
.. _python-requests: https://docs.python-requests.org/en/master/
317316
.. _RTMPDump: https://rtmpdump.mplayerhq.hu/
318317
.. _pycountry: https://pypi.org/project/pycountry/
319318
.. _pycrypto: https://www.dlitz.net/software/pycrypto/
@@ -324,7 +323,6 @@ With these two environment variables it is possible to use `pycrypto`_ instead o
324323
.. _isodate: https://pypi.org/project/isodate/
325324
.. _PySocks: https://github.com/Anorov/PySocks
326325
.. _websocket-client: https://pypi.org/project/websocket-client/
327-
.. _#3880: https://github.com/streamlink/streamlink/pull/3880
328326

329327

330328
Windows binaries

script/makeinstaller.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ format=bundled
9292
packages=pkg_resources
9393
iso639
9494
pypi_wheels=certifi==2021.5.30
95-
chardet==4.0.0
96-
idna==2.10
95+
charset-normalizer==2.0.4
96+
idna==3.2
9797
iso3166==1.0.1
9898
isodate==0.6.0
9999
pycryptodome==3.10.1
100100
PySocks==1.7.1
101-
requests==2.25.1
101+
requests==2.26.0
102102
six==1.16.0
103103
urllib3==1.26.6
104-
websocket-client==1.1.0
104+
websocket-client==1.2.1
105105
106106
files=${ROOT}/win32/THIRD-PARTY.txt > \$INSTDIR
107107
${ROOT}/build/lib/streamlink > \$INSTDIR\pkgs

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010

1111
data_files = []
1212
deps = [
13-
# Temporarily set requests to 2.25.1 on Windows to fix issues with randomly failing tests
14-
# Don't force an older requests version on non-Windows systems due to packaging reasons
15-
"requests>=2.26.0,<3.0 ; platform_system!='Windows'",
16-
"requests==2.25.1 ; platform_system=='Windows'",
13+
"requests>=2.26.0,<3.0",
1714
"isodate",
1815
"websocket-client>=0.58.0",
1916
# Support for SOCKS proxies

0 commit comments

Comments
 (0)