From 33d7bc0216f834a78e800ec87e8b8a40e01d892a Mon Sep 17 00:00:00 2001 From: beardypig Date: Thu, 14 Sep 2017 16:40:16 +0100 Subject: [PATCH] update to streamlink 0.8.1 --- README.md | 14 ++++++++++---- scripts/makeportable.sh | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4b102f2..858b8fa 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # Streamlink Portable A script to build a portable version of Streamlink for Windows. -The portable zip files are build from the master branch of [streamlink/streamlink](https://github.com/streamlink/streamlink) and come bundled with Python 3.5.2. There is a 32 bit and a 64 bit version available for 32 bit Windows and 64 bit Windows (if in doubt use the 32 bit version). +The portable zip files are build from the master branch of [streamlink/streamlink](https://github.com/streamlink/streamlink) and come bundled with Python 3.5.4. There is a 32 bit and a 64 bit version available for 32 bit Windows and 64 bit Windows (if in doubt use the 32 bit version). The latest versions of the portable zips can be downloaded here: - [streamlink-portable-latest-win32.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-win32.zip) - [streamlink-portable-latest-amd64.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-amd64.zip) -A stable version is also available, based on the `0.7.0` tag of streamlink: -- [streamlink-portable-0.7.0-py3.5.2-win32.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.7.0/streamlink-portable-0.7.0-py3.5.2-win32.zip) -- [streamlink-portable-0.7.0-py3.5.2-amd64.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.7.0/streamlink-portable-0.7.0-py3.5.2-amd64.zip) +A stable version is also available, based on the `0.8.1` tag of streamlink: +- [streamlink-portable-0.8.1-py3.5.2-win32.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.8.1/streamlink-portable-0.8.1-py3.5.4-win32.zip) +- [streamlink-portable-0.8.1-py3.5.2-amd64.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.8.1/streamlink-portable-0.8.1-py3.5.4-amd64.zip) To install simply unzip the zip file. @@ -26,6 +26,12 @@ NB. `sed` must be `gnu-sed` ## Changelog +### 2017-09-14 + +* Release stable `0.8.1`. +* Resolved issue with missing `websocket` and `PySocks` modules. +* Update to Python 3.5.4. + ### 2017-07-05 * Release stable `0.7.0`. diff --git a/scripts/makeportable.sh b/scripts/makeportable.sh index 369c158..83e2e58 100755 --- a/scripts/makeportable.sh +++ b/scripts/makeportable.sh @@ -7,7 +7,7 @@ set -e # quit on error branch=${1:-master} STREAMLINK_PYTHON_ARCH=${2:-win32} -STREAMLINK_PYTHON_VERSION=3.5.3 +STREAMLINK_PYTHON_VERSION=3.5.4 PYTHON_PLATFORM=${STREAMLINK_PYTHON_ARCH} if [[ "${STREAMLINK_PYTHON_ARCH}" == "amd64" ]]; then @@ -38,7 +38,7 @@ commit=$(git rev-parse --short HEAD) echo "Downloading Python dependencies..." pip download --only-binary ":all:" --platform "${PYTHON_PLATFORM}" --python-version "35" --abi "cp35m" -d "${temp_dir}" "pycryptodome==3.4.3" > /dev/null -pip install --upgrade -t "${packages_dir}" "iso-639" "iso3166" "setuptools" "requests>=1.0,>=2.18.0,<3.0" > /dev/null +pip install --upgrade -t "${packages_dir}" "iso-639" "iso3166" "setuptools" "requests>=1.0,>=2.18.0,<3.0" "websocket-client" "PySocks!=1.5.7,>=1.5.6" > /dev/null # Work out the streamlink version # For travis nightly builds generate a version number with commit hash